ASoC: simple-card-utils: Set sysclk on all components

[sfrench/cifs-2.6.git] / sound / soc / generic / simple-card-utils.c

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index a81323d1691d023dcc8018f55586f6f265271a64..9736102e68088da52e6b4a7f0bce15cc34983107 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -275,6 +275,7 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream,
                mclk_fs = props->mclk_fs;
 
        if (mclk_fs) {
+               struct snd_soc_component *component;
                mclk = params_rate(params) * mclk_fs;
 
                for_each_prop_dai_codec(props, i, pdai) {
@@ -282,16 +283,30 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream,
                        if (ret < 0)
                                return ret;
                }
+
                for_each_prop_dai_cpu(props, i, pdai) {
                        ret = asoc_simple_set_clk_rate(pdai, mclk);
                        if (ret < 0)
                                return ret;
                }
+
+               /* Ensure sysclk is set on all components in case any
+                * (such as platform components) are missed by calls to
+                * snd_soc_dai_set_sysclk.
+                */
+               for_each_rtd_components(rtd, i, component) {
+                       ret = snd_soc_component_set_sysclk(component, 0, 0,
+                                                          mclk, SND_SOC_CLOCK_IN);
+                       if (ret && ret != -ENOTSUPP)
+                               return ret;
+               }
+
                for_each_rtd_codec_dais(rtd, i, sdai) {
                        ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, SND_SOC_CLOCK_IN);
                        if (ret && ret != -ENOTSUPP)
                                return ret;
                }
+
                for_each_rtd_cpu_dais(rtd, i, sdai) {
                        ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, SND_SOC_CLOCK_OUT);
                        if (ret && ret != -ENOTSUPP)