1 files changed, 35 insertions, 4 deletions

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 98f97e543c29..03a7fdcdf114 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -24,9 +24,32 @@ struct simple_card_data {
                 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_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;
+
+        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,
+};
+
 static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
                                        struct asoc_simple_dai *set)
 {
@@ -144,7 +167,8 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
 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)
+                                   struct simple_dai_props *dai_props,
+                                   bool is_top_level_node)
 {
         struct device_node *np = NULL;
         struct device_node *bitclkmaster = NULL;
@@ -155,7 +179,8 @@ static int simple_card_dai_link_of(struct device_node *node,
         char *prefix = "";
         int ret;
 
-        prefix = "simple-audio-card,";
+        if (is_top_level_node)
+                prefix = "simple-audio-card,";
 
         daifmt = snd_soc_of_parse_daifmt(node, prefix,
                                          &bitclkmaster, &framemaster);
@@ -249,6 +274,7 @@ static int simple_card_dai_link_of(struct device_node *node,
         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",
@@ -298,6 +324,10 @@ static int asoc_simple_card_parse_of(struct device_node *node,
                         return ret;
         }
 
+        /* 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 : "");
 
@@ -307,14 +337,15 @@ static int asoc_simple_card_parse_of(struct device_node *node,
                 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);
+                                                      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);
+                ret = simple_card_dai_link_of(node, dev, dai_link, dai_props,
+                                              true);
                 if (ret < 0)
                         return ret;
         }