ASoC: soc-core.c: add index on snd_soc_of_get_dai_name()

Current snd_soc_of_get_dai_name() doesn't accept index
for #sound-dai-cells. It is not useful for user.
This patch adds it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87pm5qdgng.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 943f0a1b2d274beb93765119fa13db72905a000a..b27f84580c5b0b840ba360e6b822e82dea839d48 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1319,7 +1319,7 @@ int snd_soc_get_dai_id(struct device_node *ep);
 int snd_soc_get_dai_name(const struct of_phandle_args *args,
                         const char **dai_name);
 int snd_soc_of_get_dai_name(struct device_node *of_node,
-                           const char **dai_name);
+                           const char **dai_name, int index);
 int snd_soc_of_get_dai_link_codecs(struct device *dev,
                                   struct device_node *of_node,
                                   struct snd_soc_dai_link *dai_link);

diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
index 78e2e3932ba59f5c068a034342ae349af1b0f14a..6f3b1428a5ba1791556c4d24ab9d7f3c230c28f0 100644 (file)
--- a/sound/soc/fsl/imx-card.c
+++ b/sound/soc/fsl/imx-card.c
@@ -586,7 +586,7 @@ static int imx_card_parse_of(struct imx_card_data *data)
                link->platforms->of_node = link->cpus->of_node;
                link->id = args.args[0];
 
-               ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name);
+               ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name, 0);
                if (ret) {
                        dev_err_probe(card->dev, ret,
                                      "%s: error getting cpu dai name\n", link->name);

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 5a5e4ecd0f61c37cf5d795cde200d3c8faa4a9e2..5b59198a0384626b7e07035430b467c88aaaceb8 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -89,7 +89,7 @@ static int asoc_simple_parse_dai(struct device_node *node,
         * 2) user need to rebind Sound Card everytime
         *    if he unbinded CPU or Codec.
         */
-       ret = snd_soc_of_get_dai_name(node, &dlc->dai_name);
+       ret = snd_soc_of_get_dai_name(node, &dlc->dai_name, 0);
        if (ret < 0)
                return ret;
 

diff --git a/sound/soc/loongson/loongson_card.c b/sound/soc/loongson/loongson_card.c
index 08df05cb432818e5114dcaf27049c2c421cfb647..94f02b787c98fe525c16eb541b64cb7cebae58ac 100644 (file)
--- a/sound/soc/loongson/loongson_card.c
+++ b/sound/soc/loongson/loongson_card.c
@@ -151,8 +151,8 @@ static int loongson_card_parse_of(struct loongson_card_data *data)
        for (i = 0; i < card->num_links; i++)
                loongson_dai_links[i].codecs->of_node = args.np;
 
-       snd_soc_of_get_dai_name(cpu, &cpu_dai_name);
-       snd_soc_of_get_dai_name(codec, &codec_dai_name);
+       snd_soc_of_get_dai_name(cpu, &cpu_dai_name, 0);
+       snd_soc_of_get_dai_name(codec, &codec_dai_name, 0);
        for (i = 0; i < card->num_links; i++) {
                loongson_dai_links[i].cpus->dai_name = cpu_dai_name;
                loongson_dai_links[i].codecs->dai_name = codec_dai_name;

diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
index e05f2b0231fe857daf9ae5f630c563ecf7d485ef..3ece4b5eaca29c914782e4de3e6155f0684c167e 100644 (file)
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
@@ -288,7 +288,7 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
 
        np = of_get_child_by_name(pdev->dev.of_node, "codec-capture");
        if (np) {
-               ret = snd_soc_of_get_dai_name(np, &codec_capture_dai);
+               ret = snd_soc_of_get_dai_name(np, &codec_capture_dai, 0);
                of_node_put(np);
                if (ret < 0) {
                        dev_err(&pdev->dev,

diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c
index cab5a7937a5760cd69c03efd155a8268be1d49a0..d9ebb883b999c969ad73d8c894c89c82ea256787 100644 (file)
--- a/sound/soc/qcom/common.c
+++ b/sound/soc/qcom/common.c
@@ -105,7 +105,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
                link->cpus->of_node = args.np;
                link->id = args.args[0];
 
-               ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name);
+               ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name, 0);
                if (ret) {
                        dev_err_probe(card->dev, ret,
                                      "%s: error getting cpu dai name\n", link->name);

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 8dba5bb26ffe5257d656f22fe7c48b94ebed80ca..7b13b1b232ef1ffaaca123649358dcab87f5254c 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3355,10 +3355,10 @@ int snd_soc_get_dai_name(const struct of_phandle_args *args,
 EXPORT_SYMBOL_GPL(snd_soc_get_dai_name);
 
 int snd_soc_of_get_dai_name(struct device_node *of_node,
-                           const char **dai_name)
+                           const char **dai_name, int index)
 {
        struct snd_soc_dai_link_component dlc;
-       int ret = snd_soc_of_get_dlc(of_node, NULL, &dlc, 0);
+       int ret = snd_soc_of_get_dlc(of_node, NULL, &dlc, index);
 
        if (ret == 0)
                *dai_name = dlc.dai_name;