ASoC: rt5682: Let dai clks be registered whether mclk exists or not
authorderek.fang <derek.fang@realtek.com>
Fri, 12 Jun 2020 05:15:25 +0000 (13:15 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 15 Jun 2020 14:18:29 +0000 (15:18 +0100)
According to ideal rt5682 CCF, the root clk is mclk.
But in some platforms, mclk is not exported to CCF.
In this condition, rt5682_register_dai_clks will not be called.
This patch lets dai clks could be registered whether mclk exists or not.

Signed-off-by: derek.fang <derek.fang@realtek.com>
Link: https://lore.kernel.org/r/1591938925-1070-5-git-send-email-derek.fang@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5682.c

index d3245123101de45ecb804caaf50fa6d343458ec8..3e9d2c6c51f9a60cacab882ddcf91f0fa2601ddc 100644 (file)
@@ -2829,12 +2829,13 @@ static int rt5682_probe(struct snd_soc_component *component)
                                return ret;
                        }
                        rt5682->mclk = NULL;
-               } else {
-                       /* Register CCF DAI clock control */
-                       ret = rt5682_register_dai_clks(component);
-                       if (ret)
-                               return ret;
                }
+
+               /* Register CCF DAI clock control */
+               ret = rt5682_register_dai_clks(component);
+               if (ret)
+                       return ret;
+
                /* Initial setup for CCF */
                rt5682->lrck[RT5682_AIF1] = CLK_48;
 #endif