Merge remote-tracking branch 'asoc/topic/simple' into asoc-next

2 files changed, 183 insertions, 79 deletions

diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index 881914b139ca..131aa2ad7f1a 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -23,6 +23,11 @@ Optional properties:
 
 Required subnodes:
 
+- simple-audio-card,dai-link            : container for the CPU and CODEC sub-nodes
+                                          This container may be omitted when the
+                                          card has only one DAI link.
+                                          See the examples.
+
 - simple-audio-card,cpu                 : CPU   sub-node
 - simple-audio-card,codec               : CODEC sub-node
 
@@ -49,7 +54,7 @@ Note:
    CPU and CODEC sides as we need to keep the settings identical for both ends
    of the link.
 
-Example:
+Example 1 - single DAI link:
 
 sound {
         compatible = "simple-audio-card";
@@ -94,3 +99,38 @@ sh_fsi2: sh_fsi2@ec230000 {
         interrupt-parent = <&gic>;
         interrupts = <0 146 0x4>;
 };
+
+Example 2 - many DAI links:
+
+sound {
+        compatible = "simple-audio-card";
+        simple-audio-card,name = "Cubox Audio";
+        simple-audio-card,format = "i2s";
+
+        simple-audio-card,dai-link@0 {          /* I2S - HDMI */
+                simple-audio-card,cpu {
+                        sound-dai = <&audio1 0>;
+                };
+                simple-audio-card,codec {
+                        sound-dai = <&tda998x 0>;
+                };
+        };
+
+        simple-audio-card,dai-link@1 {          /* S/PDIF - HDMI */
+                simple-audio-card,cpu {
+                        sound-dai = <&audio1 1>;
+                };
+                simple-audio-card,codec {
+                        sound-dai = <&tda998x 1>;
+                };
+        };
+
+        simple-audio-card,dai-link@2 {          /* S/PDIF - S/PDIF */
+                simple-audio-card,cpu {
+                        sound-dai = <&audio1 1>;
+                };
+                simple-audio-card,codec {
+                        sound-dai = <&spdif_codec>;
+                };
+        };
+};
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 2ee8ed56bcf1..21f1ccbdf582 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -20,9 +20,11 @@
 
 struct simple_card_data {
         struct snd_soc_card snd_card;
-        struct asoc_simple_dai cpu_dai;
-        struct asoc_simple_dai codec_dai;
-        struct snd_soc_dai_link snd_link;
+        struct simple_dai_props {
+                struct asoc_simple_dai cpu_dai;
+                struct asoc_simple_dai codec_dai;
+        } *dai_props;
+        struct snd_soc_dai_link dai_link[];     /* dynamically allocated */
 };
 
 static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
@@ -68,13 +70,16 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
                                 snd_soc_card_get_drvdata(rtd->card);
         struct snd_soc_dai *codec = rtd->codec_dai;
         struct snd_soc_dai *cpu = rtd->cpu_dai;
-        int ret;
+        struct simple_dai_props *dai_props;
+        int num, ret;
 
-        ret = __asoc_simple_card_dai_init(codec, &priv->codec_dai);
+        num = rtd - rtd->card->rtd;
+        dai_props = &priv->dai_props[num];
+        ret = __asoc_simple_card_dai_init(codec, &dai_props->codec_dai);
         if (ret < 0)
                 return ret;
 
-        ret = __asoc_simple_card_dai_init(cpu, &priv->cpu_dai);
+        ret = __asoc_simple_card_dai_init(cpu, &dai_props->cpu_dai);
         if (ret < 0)
                 return ret;
 
@@ -146,13 +151,47 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
         return 0;
 }
 
+static int simple_card_cpu_codec_of(struct device_node *node,
+                                int daifmt,
+                                struct snd_soc_dai_link *dai_link,
+                                struct simple_dai_props *dai_props)
+{
+        struct device_node *np;
+        int ret;
+
+        /* CPU sub-node */
+        ret = -EINVAL;
+        np = of_get_child_by_name(node, "simple-audio-card,cpu");
+        if (np) {
+                ret = asoc_simple_card_sub_parse_of(np, daifmt,
+                                                &dai_props->cpu_dai,
+                                                &dai_link->cpu_of_node,
+                                                &dai_link->cpu_dai_name);
+                of_node_put(np);
+        }
+        if (ret < 0)
+                return ret;
+
+        /* CODEC sub-node */
+        ret = -EINVAL;
+        np = of_get_child_by_name(node, "simple-audio-card,codec");
+        if (np) {
+                ret = asoc_simple_card_sub_parse_of(np, daifmt,
+                                                &dai_props->codec_dai,
+                                                &dai_link->codec_of_node,
+                                                &dai_link->codec_dai_name);
+                of_node_put(np);
+        }
+        return ret;
+}
+
 static int asoc_simple_card_parse_of(struct device_node *node,
                                      struct simple_card_data *priv,
-                                     struct device *dev)
+                                     struct device *dev,
+                                     int multi)
 {
         struct snd_soc_dai_link *dai_link = priv->snd_card.dai_link;
-        struct asoc_simple_dai *codec_dai = &priv->codec_dai;
-        struct asoc_simple_dai *cpu_dai = &priv->cpu_dai;
+        struct simple_dai_props *dai_props = priv->dai_props;
         struct device_node *np;
         char *name;
         unsigned int daifmt;
@@ -181,78 +220,71 @@ static int asoc_simple_card_parse_of(struct device_node *node,
                         return ret;
         }
 
-        /* CPU sub-node */
-        ret = -EINVAL;
-        np = of_get_child_by_name(node, "simple-audio-card,cpu");
-        if (np) {
-                ret = asoc_simple_card_sub_parse_of(np, daifmt,
-                                                  cpu_dai,
-                                                  &dai_link->cpu_of_node,
-                                                  &dai_link->cpu_dai_name);
-                of_node_put(np);
-        }
-        if (ret < 0)
-                return ret;
+        /* loop on the DAI links */
+        np = NULL;
+        for (;;) {
+                if (multi) {
+                        np = of_get_next_child(node, np);
+                        if (!np)
+                                break;
+                }
 
-        /* CODEC sub-node */
-        ret = -EINVAL;
-        np = of_get_child_by_name(node, "simple-audio-card,codec");
-        if (np) {
-                ret = asoc_simple_card_sub_parse_of(np, daifmt,
-                                                  codec_dai,
-                                                  &dai_link->codec_of_node,
-                                                  &dai_link->codec_dai_name);
-                of_node_put(np);
-        }
-        if (ret < 0)
-                return ret;
+                ret = simple_card_cpu_codec_of(multi ? np : node,
+                                        daifmt, dai_link, dai_props);
+                if (ret < 0)
+                        goto err;
 
-        /*
-         * overwrite cpu_dai->fmt as its DAIFMT_MASTER bit is based on CODEC
-         * while the other bits should be identical unless buggy SW/HW design.
-         */
-        cpu_dai->fmt = codec_dai->fmt;
+                /*
+                 * overwrite cpu_dai->fmt as its DAIFMT_MASTER bit is based on CODEC
+                 * while the other bits should be identical unless buggy SW/HW design.
+                 */
+                dai_props->cpu_dai.fmt = dai_props->codec_dai.fmt;
+
+                if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) {
+                        ret = -EINVAL;
+                        goto err;
+                }
+
+                /* simple-card assumes platform == cpu */
+                dai_link->platform_of_node = dai_link->cpu_of_node;
+
+                name = devm_kzalloc(dev,
+                                    strlen(dai_link->cpu_dai_name)   +
+                                    strlen(dai_link->codec_dai_name) + 2,
+                                    GFP_KERNEL);
+                sprintf(name, "%s-%s", dai_link->cpu_dai_name,
+                                        dai_link->codec_dai_name);
+                dai_link->name = dai_link->stream_name = name;
 
-        if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name)
-                return -EINVAL;
+                if (!multi)
+                        break;
+
+                dai_link++;
+                dai_props++;
+        }
 
         /* card name is created from CPU/CODEC dai name */
-        name = devm_kzalloc(dev,
-                            strlen(dai_link->cpu_dai_name)   +
-                            strlen(dai_link->codec_dai_name) + 2,
-                            GFP_KERNEL);
-        sprintf(name, "%s-%s", dai_link->cpu_dai_name,
-                                dai_link->codec_dai_name);
+        dai_link = priv->snd_card.dai_link;
         if (!priv->snd_card.name)
-                priv->snd_card.name = name;
-        dai_link->name = dai_link->stream_name = name;
-
-        /* simple-card assumes platform == cpu */
-        dai_link->platform_of_node = dai_link->cpu_of_node;
+                priv->snd_card.name = dai_link->name;
 
-        dev_dbg(dev, "card-name : %s\n", name);
+        dev_dbg(dev, "card-name : %s\n", priv->snd_card.name);
         dev_dbg(dev, "platform : %04x\n", daifmt);
+        dai_props = priv->dai_props;
         dev_dbg(dev, "cpu : %s / %04x / %d\n",
                 dai_link->cpu_dai_name,
-                cpu_dai->fmt,
-                cpu_dai->sysclk);
+                dai_props->cpu_dai.fmt,
+                dai_props->cpu_dai.sysclk);
         dev_dbg(dev, "codec : %s / %04x / %d\n",
                 dai_link->codec_dai_name,
-                codec_dai->fmt,
-                codec_dai->sysclk);
-
-        /*
-         * soc_bind_dai_link() will check cpu name
-         * after of_node matching if dai_link has cpu_dai_name.
-         * but, it will never match if name was created by fmt_single_name()
-         * remove cpu_dai_name to escape name matching.
-         * see
-         *      fmt_single_name()
-         *      fmt_multiple_name()
-         */
-        dai_link->cpu_dai_name = NULL;
+                dai_props->codec_dai.fmt,
+                dai_props->codec_dai.sysclk);
 
         return 0;
+
+err:
+        of_node_put(np);
+        return ret;
 }
 
 /* update the reference count of the devices nodes at end of probe */
@@ -282,9 +314,21 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
         struct snd_soc_dai_link *dai_link;
         struct device_node *np = pdev->dev.of_node;
         struct device *dev = &pdev->dev;
-        int ret;
+        int num_links, multi, ret;
+
+        /* get the number of DAI links */
+        if (np && of_get_child_by_name(np, "simple-audio-card,dai-link")) {
+                num_links = of_get_child_count(np);
+                multi = 1;
+        } else {
+                num_links = 1;
+                multi = 0;
+        }
 
-        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        /* allocate the private data and the DAI link array */
+        priv = devm_kzalloc(dev,
+                        sizeof(*priv) + sizeof(*dai_link) * num_links,
+                        GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
@@ -293,18 +337,38 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
          */
         priv->snd_card.owner = THIS_MODULE;
         priv->snd_card.dev = dev;
-        dai_link = &priv->snd_link;
+        dai_link = priv->dai_link;
         priv->snd_card.dai_link = dai_link;
-        priv->snd_card.num_links = 1;
+        priv->snd_card.num_links = num_links;
+
+        /* get room for the other properties */
+        priv->dai_props = devm_kzalloc(dev,
+                        sizeof(*priv->dai_props) * num_links,
+                        GFP_KERNEL);
+        if (!priv->dai_props)
+                return -ENOMEM;
 
         if (np && of_device_is_available(np)) {
 
-                ret = asoc_simple_card_parse_of(np, priv, dev);
+                ret = asoc_simple_card_parse_of(np, priv, dev, multi);
                 if (ret < 0) {
                         if (ret != -EPROBE_DEFER)
                                 dev_err(dev, "parse error %d\n", ret);
                         goto err;
                 }
+
+                /*
+                 * soc_bind_dai_link() will check cpu name
+                 * after of_node matching if dai_link has cpu_dai_name.
+                 * but, it will never match if name was created by fmt_single_name()
+                 * remove cpu_dai_name to escape name matching.
+                 * see
+                 *      fmt_single_name()
+                 *      fmt_multiple_name()
+                 */
+                if (num_links == 1)
+                        dai_link->cpu_dai_name = NULL;
+
         } else {
                 struct asoc_simple_card_info *cinfo;
 
@@ -330,13 +394,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
                 dai_link->codec_name    = cinfo->codec;
                 dai_link->cpu_dai_name  = cinfo->cpu_dai.name;
                 dai_link->codec_dai_name = cinfo->codec_dai.name;
-                memcpy(&priv->cpu_dai, &cinfo->cpu_dai,
-                                                sizeof(priv->cpu_dai));
-                memcpy(&priv->codec_dai, &cinfo->codec_dai,
-                                                sizeof(priv->codec_dai));
+                memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai,
+                                        sizeof(priv->dai_props->cpu_dai));
+                memcpy(&priv->dai_props->codec_dai, &cinfo->codec_dai,
+                                        sizeof(priv->dai_props->codec_dai));
 
-                priv->cpu_dai.fmt       |= cinfo->daifmt;
-                priv->codec_dai.fmt     |= cinfo->daifmt;
+                priv->dai_props->cpu_dai.fmt    |= cinfo->daifmt;
+                priv->dai_props->codec_dai.fmt  |= cinfo->daifmt;
         }
 
         /*