Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git] / sound / soc / generic / simple-card.c
index 7c5dc73..03a7fdc 100644 (file)
@@ -9,48 +9,99 @@
  * published by the Free Software Foundation.
  */
 #include <linux/clk.h>
+#include <linux/device.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
 #include <sound/simple_card.h>
+#include <sound/soc-dai.h>
+#include <sound/soc.h>
+
+struct simple_card_data {
+       struct snd_soc_card snd_card;
+       struct simple_dai_props {
+               struct asoc_simple_dai cpu_dai;
+               struct asoc_simple_dai codec_dai;
+       } *dai_props;
+       unsigned int mclk_fs;
+       struct snd_soc_dai_link dai_link[];     /* dynamically allocated */
+};
 
-static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
-                                      struct asoc_simple_dai *set,
-                                      unsigned int daifmt)
+static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
+                                     struct snd_pcm_hw_params *params)
 {
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
+       unsigned int mclk;
        int ret = 0;
 
-       daifmt |= set->fmt;
+       if (priv->mclk_fs) {
+               mclk = params_rate(params) * priv->mclk_fs;
+               ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
+                                            SND_SOC_CLOCK_IN);
+       }
+
+       return ret;
+}
+
+static struct snd_soc_ops asoc_simple_card_ops = {
+       .hw_params = asoc_simple_card_hw_params,
+};
 
-       if (daifmt)
-               ret = snd_soc_dai_set_fmt(dai, daifmt);
+static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
+                                      struct asoc_simple_dai *set)
+{
+       int ret;
 
-       if (ret == -ENOTSUPP) {
-               dev_dbg(dai->dev, "ASoC: set_fmt is not supported\n");
-               ret = 0;
+       if (set->fmt) {
+               ret = snd_soc_dai_set_fmt(dai, set->fmt);
+               if (ret && ret != -ENOTSUPP) {
+                       dev_err(dai->dev, "simple-card: set_fmt error\n");
+                       goto err;
+               }
        }
 
-       if (!ret && set->sysclk)
+       if (set->sysclk) {
                ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);
+               if (ret && ret != -ENOTSUPP) {
+                       dev_err(dai->dev, "simple-card: set_sysclk error\n");
+                       goto err;
+               }
+       }
+
+       if (set->slots) {
+               ret = snd_soc_dai_set_tdm_slot(dai, 0, 0,
+                                               set->slots,
+                                               set->slot_width);
+               if (ret && ret != -ENOTSUPP) {
+                       dev_err(dai->dev, "simple-card: set_tdm_slot error\n");
+                       goto err;
+               }
+       }
+
+       ret = 0;
 
+err:
        return ret;
 }
 
 static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 {
-       struct asoc_simple_card_info *info =
-                               snd_soc_card_get_drvdata(rtd->card);
+       struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
        struct snd_soc_dai *codec = rtd->codec_dai;
        struct snd_soc_dai *cpu = rtd->cpu_dai;
-       unsigned int daifmt = info->daifmt;
-       int ret;
+       struct simple_dai_props *dai_props;
+       int num, ret;
 
-       ret = __asoc_simple_card_dai_init(codec, &info->codec_dai, daifmt);
+       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, &info->cpu_dai, daifmt);
+       ret = __asoc_simple_card_dai_init(cpu, &dai_props->cpu_dai);
        if (ret < 0)
                return ret;
 
@@ -60,8 +111,10 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 static int
 asoc_simple_card_sub_parse_of(struct device_node *np,
                              struct asoc_simple_dai *dai,
-                             struct device_node **node)
+                             const struct device_node **p_node,
+                             const char **name)
 {
+       struct device_node *node;
        struct clk *clk;
        int ret;
 
@@ -69,21 +122,20 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
         * get node via "sound-dai = <&phandle port>"
         * it will be used as xxx_of_node on soc_bind_dai_link()
         */
-       *node = of_parse_phandle(np, "sound-dai", 0);
-       if (!*node)
+       node = of_parse_phandle(np, "sound-dai", 0);
+       if (!node)
                return -ENODEV;
+       *p_node = node;
 
        /* get dai->name */
-       ret = snd_soc_of_get_dai_name(np, &dai->name);
+       ret = snd_soc_of_get_dai_name(np, name);
        if (ret < 0)
-               goto parse_error;
+               return ret;
 
-       /*
-        * bitclock-inversion, frame-inversion
-        * bitclock-master,    frame-master
-        * and specific "format" if it has
-        */
-       dai->fmt = snd_soc_of_parse_daifmt(np, NULL);
+       /* parse TDM slot */
+       ret = snd_soc_of_parse_tdm_slot(np, &dai->slots, &dai->slot_width);
+       if (ret)
+               return ret;
 
        /*
         * dai->sysclk come from
@@ -95,7 +147,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
                clk = of_clk_get(np, 0);
                if (IS_ERR(clk)) {
                        ret = PTR_ERR(clk);
-                       goto parse_error;
+                       return ret;
                }
 
                dai->sysclk = clk_get_rate(clk);
@@ -104,166 +156,334 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
                                     "system-clock-frequency",
                                     &dai->sysclk);
        } else {
-               clk = of_clk_get(*node, 0);
+               clk = of_clk_get(node, 0);
                if (!IS_ERR(clk))
                        dai->sysclk = clk_get_rate(clk);
        }
 
-       ret = 0;
+       return 0;
+}
+
+static int simple_card_dai_link_of(struct device_node *node,
+                                  struct device *dev,
+                                  struct snd_soc_dai_link *dai_link,
+                                  struct simple_dai_props *dai_props,
+                                  bool is_top_level_node)
+{
+       struct device_node *np = NULL;
+       struct device_node *bitclkmaster = NULL;
+       struct device_node *framemaster = NULL;
+       unsigned int daifmt;
+       char *name;
+       char prop[128];
+       char *prefix = "";
+       int ret;
+
+       if (is_top_level_node)
+               prefix = "simple-audio-card,";
+
+       daifmt = snd_soc_of_parse_daifmt(node, prefix,
+                                        &bitclkmaster, &framemaster);
+       daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
+
+       snprintf(prop, sizeof(prop), "%scpu", prefix);
+       np = of_get_child_by_name(node, prop);
+       if (!np) {
+               ret = -EINVAL;
+               dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop);
+               goto dai_link_of_err;
+       }
 
-parse_error:
-       of_node_put(*node);
+       ret = asoc_simple_card_sub_parse_of(np, &dai_props->cpu_dai,
+                                           &dai_link->cpu_of_node,
+                                           &dai_link->cpu_dai_name);
+       if (ret < 0)
+               goto dai_link_of_err;
+
+       dai_props->cpu_dai.fmt = daifmt;
+       switch (((np == bitclkmaster) << 4) | (np == framemaster)) {
+       case 0x11:
+               dai_props->cpu_dai.fmt |= SND_SOC_DAIFMT_CBS_CFS;
+               break;
+       case 0x10:
+               dai_props->cpu_dai.fmt |= SND_SOC_DAIFMT_CBS_CFM;
+               break;
+       case 0x01:
+               dai_props->cpu_dai.fmt |= SND_SOC_DAIFMT_CBM_CFS;
+               break;
+       default:
+               dai_props->cpu_dai.fmt |= SND_SOC_DAIFMT_CBM_CFM;
+               break;
+       }
+
+       of_node_put(np);
+       snprintf(prop, sizeof(prop), "%scodec", prefix);
+       np = of_get_child_by_name(node, prop);
+       if (!np) {
+               ret = -EINVAL;
+               dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop);
+               goto dai_link_of_err;
+       }
+
+       ret = asoc_simple_card_sub_parse_of(np, &dai_props->codec_dai,
+                                           &dai_link->codec_of_node,
+                                           &dai_link->codec_dai_name);
+       if (ret < 0)
+               goto dai_link_of_err;
+
+       if (strlen(prefix) && !bitclkmaster && !framemaster) {
+               /* No dai-link level and master setting was not found from
+                  sound node level, revert back to legacy DT parsing and
+                  take the settings from codec node. */
+               dev_dbg(dev, "%s: Revert to legacy daifmt parsing\n",
+                       __func__);
+               dai_props->cpu_dai.fmt = dai_props->codec_dai.fmt =
+                       snd_soc_of_parse_daifmt(np, NULL, NULL, NULL) |
+                       (daifmt & ~SND_SOC_DAIFMT_CLOCK_MASK);
+       } else {
+               dai_props->codec_dai.fmt = daifmt;
+               switch (((np == bitclkmaster) << 4) | (np == framemaster)) {
+               case 0x11:
+                       dai_props->codec_dai.fmt |= SND_SOC_DAIFMT_CBM_CFM;
+                       break;
+               case 0x10:
+                       dai_props->codec_dai.fmt |= SND_SOC_DAIFMT_CBM_CFS;
+                       break;
+               case 0x01:
+                       dai_props->codec_dai.fmt |= SND_SOC_DAIFMT_CBS_CFM;
+                       break;
+               default:
+                       dai_props->codec_dai.fmt |= SND_SOC_DAIFMT_CBS_CFS;
+                       break;
+               }
+       }
 
+       if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) {
+               ret = -EINVAL;
+               goto dai_link_of_err;
+       }
+
+       /* simple-card assumes platform == cpu */
+       dai_link->platform_of_node = dai_link->cpu_of_node;
+
+       /* Link 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->name = dai_link->stream_name = name;
+       dai_link->ops = &asoc_simple_card_ops;
+
+       dev_dbg(dev, "\tname : %s\n", dai_link->stream_name);
+       dev_dbg(dev, "\tcpu : %s / %04x / %d\n",
+               dai_link->cpu_dai_name,
+               dai_props->cpu_dai.fmt,
+               dai_props->cpu_dai.sysclk);
+       dev_dbg(dev, "\tcodec : %s / %04x / %d\n",
+               dai_link->codec_dai_name,
+               dai_props->codec_dai.fmt,
+               dai_props->codec_dai.sysclk);
+
+dai_link_of_err:
+       if (np)
+               of_node_put(np);
+       if (bitclkmaster)
+               of_node_put(bitclkmaster);
+       if (framemaster)
+               of_node_put(framemaster);
        return ret;
 }
 
 static int asoc_simple_card_parse_of(struct device_node *node,
-                                    struct asoc_simple_card_info *info,
+                                    struct simple_card_data *priv,
                                     struct device *dev,
-                                    struct device_node **of_cpu,
-                                    struct device_node **of_codec,
-                                    struct device_node **of_platform)
+                                    int multi)
 {
-       struct device_node *np;
-       char *name;
+       struct snd_soc_dai_link *dai_link = priv->snd_card.dai_link;
+       struct simple_dai_props *dai_props = priv->dai_props;
        int ret;
 
-       /* get CPU/CODEC common format via simple-audio-card,format */
-       info->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
-               (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
+       /* parsing the card name from DT */
+       snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");
+
+       /* off-codec widgets */
+       if (of_property_read_bool(node, "simple-audio-card,widgets")) {
+               ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card,
+                                       "simple-audio-card,widgets");
+               if (ret)
+                       return ret;
+       }
 
        /* DAPM routes */
        if (of_property_read_bool(node, "simple-audio-card,routing")) {
-               ret = snd_soc_of_parse_audio_routing(&info->snd_card,
+               ret = snd_soc_of_parse_audio_routing(&priv->snd_card,
                                        "simple-audio-card,routing");
                if (ret)
                        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,
-                                                 &info->cpu_dai,
-                                                 of_cpu);
-       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,
-                                                 &info->codec_dai,
-                                                 of_codec);
-       if (ret < 0)
-               return ret;
-
-       if (!info->cpu_dai.name || !info->codec_dai.name)
-               return -EINVAL;
+       /* Factor to mclk, used in hw_params() */
+       of_property_read_u32(node, "simple-audio-card,mclk-fs",
+                            &priv->mclk_fs);
+
+       dev_dbg(dev, "New simple-card: %s\n", priv->snd_card.name ?
+               priv->snd_card.name : "");
+
+       if (multi) {
+               struct device_node *np = NULL;
+               int i;
+               for (i = 0; (np = of_get_next_child(node, np)); i++) {
+                       dev_dbg(dev, "\tlink %d:\n", i);
+                       ret = simple_card_dai_link_of(np, dev, dai_link + i,
+                                                     dai_props + i, false);
+                       if (ret < 0) {
+                               of_node_put(np);
+                               return ret;
+                       }
+               }
+       } else {
+               ret = simple_card_dai_link_of(node, dev, dai_link, dai_props,
+                                             true);
+               if (ret < 0)
+                       return ret;
+       }
 
-       /* card name is created from CPU/CODEC dai name */
-       name = devm_kzalloc(dev,
-                           strlen(info->cpu_dai.name)   +
-                           strlen(info->codec_dai.name) + 2,
-                           GFP_KERNEL);
-       sprintf(name, "%s-%s", info->cpu_dai.name, info->codec_dai.name);
-       info->snd_card.name = name;
-       info->snd_link.name = info->snd_link.stream_name = name;
+       if (!priv->snd_card.name)
+               priv->snd_card.name = priv->snd_card.dai_link->name;
 
-       /* simple-card assumes platform == cpu */
-       *of_platform = *of_cpu;
-
-       dev_dbg(dev, "card-name : %s\n", name);
-       dev_dbg(dev, "platform : %04x\n", info->daifmt);
-       dev_dbg(dev, "cpu : %s / %04x / %d\n",
-               info->cpu_dai.name,
-               info->cpu_dai.fmt,
-               info->cpu_dai.sysclk);
-       dev_dbg(dev, "codec : %s / %04x / %d\n",
-               info->codec_dai.name,
-               info->codec_dai.fmt,
-               info->codec_dai.sysclk);
+       return 0;
+}
 
+/* update the reference count of the devices nodes at end of probe */
+static int asoc_simple_card_unref(struct platform_device *pdev)
+{
+       struct snd_soc_card *card = platform_get_drvdata(pdev);
+       struct snd_soc_dai_link *dai_link;
+       struct device_node *np;
+       int num_links;
+
+       for (num_links = 0, dai_link = card->dai_link;
+            num_links < card->num_links;
+            num_links++, dai_link++) {
+               np = (struct device_node *) dai_link->cpu_of_node;
+               if (np)
+                       of_node_put(np);
+               np = (struct device_node *) dai_link->codec_of_node;
+               if (np)
+                       of_node_put(np);
+       }
        return 0;
 }
 
 static int asoc_simple_card_probe(struct platform_device *pdev)
 {
-       struct asoc_simple_card_info *cinfo;
+       struct simple_card_data *priv;
+       struct snd_soc_dai_link *dai_link;
        struct device_node *np = pdev->dev.of_node;
-       struct device_node *of_cpu, *of_codec, *of_platform;
        struct device *dev = &pdev->dev;
-       int ret;
+       int num_links, multi, ret;
 
-       cinfo           = NULL;
-       of_cpu          = NULL;
-       of_codec        = NULL;
-       of_platform     = NULL;
+       /* 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;
+       }
 
-       cinfo = devm_kzalloc(dev, sizeof(*cinfo), GFP_KERNEL);
-       if (!cinfo)
+       /* 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;
+
+       /*
+        * init snd_soc_card
+        */
+       priv->snd_card.owner = THIS_MODULE;
+       priv->snd_card.dev = dev;
+       dai_link = priv->dai_link;
+       priv->snd_card.dai_link = dai_link;
+       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)) {
-               cinfo->snd_card.dev = dev;
 
-               ret = asoc_simple_card_parse_of(np, cinfo, dev,
-                                               &of_cpu,
-                                               &of_codec,
-                                               &of_platform);
+               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);
-                       return ret;
+                       goto err;
                }
-               cinfo->snd_link.cpu_of_node     = of_cpu;
-               cinfo->snd_link.codec_of_node   = of_codec;
-               cinfo->snd_link.platform_of_node = of_platform;
+
+               /*
+                * 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 {
-               if (!dev->platform_data) {
+               struct asoc_simple_card_info *cinfo;
+
+               cinfo = dev->platform_data;
+               if (!cinfo) {
                        dev_err(dev, "no info for asoc-simple-card\n");
                        return -EINVAL;
                }
 
-               memcpy(cinfo, dev->platform_data, sizeof(*cinfo));
-               cinfo->snd_card.dev = dev;
-
-               if (!cinfo->name        ||
-                   !cinfo->card        ||
-                   !cinfo->codec_dai.name      ||
-                   !cinfo->codec       ||
-                   !cinfo->platform    ||
+               if (!cinfo->name ||
+                   !cinfo->codec_dai.name ||
+                   !cinfo->codec ||
+                   !cinfo->platform ||
                    !cinfo->cpu_dai.name) {
                        dev_err(dev, "insufficient asoc_simple_card_info settings\n");
                        return -EINVAL;
                }
 
-               cinfo->snd_card.name            = cinfo->card;
-               cinfo->snd_link.name            = cinfo->name;
-               cinfo->snd_link.stream_name     = cinfo->name;
-               cinfo->snd_link.platform_name   = cinfo->platform;
-               cinfo->snd_link.codec_name      = cinfo->codec;
+               priv->snd_card.name     = (cinfo->card) ? cinfo->card : cinfo->name;
+               dai_link->name          = cinfo->name;
+               dai_link->stream_name   = cinfo->name;
+               dai_link->platform_name = cinfo->platform;
+               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->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->dai_props->cpu_dai.fmt    |= cinfo->daifmt;
+               priv->dai_props->codec_dai.fmt  |= cinfo->daifmt;
        }
 
        /*
         * init snd_soc_dai_link
         */
-       cinfo->snd_link.cpu_dai_name    = cinfo->cpu_dai.name;
-       cinfo->snd_link.codec_dai_name  = cinfo->codec_dai.name;
-       cinfo->snd_link.init            = asoc_simple_card_dai_init;
+       dai_link->init = asoc_simple_card_dai_init;
 
-       /*
-        * init snd_soc_card
-        */
-       cinfo->snd_card.owner           = THIS_MODULE;
-       cinfo->snd_card.dai_link        = &cinfo->snd_link;
-       cinfo->snd_card.num_links       = 1;
+       snd_soc_card_set_drvdata(&priv->snd_card, priv);
 
-       snd_soc_card_set_drvdata(&cinfo->snd_card, cinfo);
+       ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card);
 
-       return devm_snd_soc_register_card(&pdev->dev, &cinfo->snd_card);
+err:
+       asoc_simple_card_unref(pdev);
+       return ret;
 }
 
 static const struct of_device_id asoc_simple_of_match[] = {
@@ -274,11 +494,11 @@ MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
 
 static struct platform_driver asoc_simple_card = {
        .driver = {
-               .name   = "asoc-simple-card",
+               .name = "asoc-simple-card",
                .owner = THIS_MODULE,
                .of_match_table = asoc_simple_of_match,
        },
-       .probe          = asoc_simple_card_probe,
+       .probe = asoc_simple_card_probe,
 };
 
 module_platform_driver(asoc_simple_card);