ASoC: topology: Add alias conf parameter names for hw_configs

Currently, some parameter names in conf differ from field names in struct.
These look like typos.

This commit suggests to add aliases for such parameters, so that the names
in conf are similar to names in struct. This solution is backwards
compatible.

If the difference between conf names and struct names is done on purpose -
this commit can be dropped.

Signed-off-by: Kirill Marinushkin <k.marinushkin@gmail.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Mark Brown <broonie@kernel.org>
Cc: Pan Xiuli <xiuli.pan@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index 2ce1651b71792122efdd296b1eda39c9daf1cc04..8ebfafd8396bd0191a657c5616a27b0dfd115559 100644 (file)
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -1126,7 +1126,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "format") == 0) {
+               if (strcmp(id, "format") == 0 ||
+                   strcmp(id, "fmt") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
 
@@ -1137,7 +1138,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "bclk") == 0) {
+               if (strcmp(id, "bclk") == 0 ||
+                   strcmp(id, "bclk_master") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
 
@@ -1157,7 +1159,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "bclk_freq") == 0) {
+               if (strcmp(id, "bclk_freq") == 0 ||
+                   strcmp(id, "bclk_rate") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
 
@@ -1165,7 +1168,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "bclk_invert") == 0) {
+               if (strcmp(id, "bclk_invert") == 0 ||
+                   strcmp(id, "invert_bclk") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
 
@@ -1174,7 +1178,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "fsync") == 0) {
+               if (strcmp(id, "fsync") == 0 ||
+                   strcmp(id, "fsync_master") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
 
@@ -1194,7 +1199,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "fsync_invert") == 0) {
+               if (strcmp(id, "fsync_invert") == 0 ||
+                   strcmp(id, "invert_fsync") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
 
@@ -1203,7 +1209,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "fsync_freq") == 0) {
+               if (strcmp(id, "fsync_freq") == 0 ||
+                   strcmp(id, "fsync_rate") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
 
@@ -1211,7 +1218,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "mclk_freq") == 0) {
+               if (strcmp(id, "mclk_freq") == 0 ||
+                   strcmp(id, "mclk_rate") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
 
@@ -1219,7 +1227,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "mclk") == 0) {
+               if (strcmp(id, "mclk") == 0 ||
+                   strcmp(id, "mclk_direction") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;
 
@@ -1239,7 +1248,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,
                        continue;
                }
 
-               if (strcmp(id, "pm_gate_clocks") == 0) {
+               if (strcmp(id, "pm_gate_clocks") == 0 ||
+                   strcmp(id, "clock_gated") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;