ASoC: codecs: rx-macro: setup soundwire clks correctly

For SoundWire Frame sync to be generated correctly we need both MCLK
and MCLKx2 (npl). Without pm runtime enabled these two clocks will remain on,
however after adding pm runtime support its possible that NPl clock could be
turned off even when SoundWire controller is active.

Fix this by enabling mclk and npl clk when SoundWire clks are enabled.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220224111718.6264-10-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
index c627b0afdf7e399d2e1bc998f43a204c10aacac9..65fc3698492f3cf40fdf079332d06dce1d3e7cd2 100644 (file)
--- a/sound/soc/codecs/lpass-rx-macro.c
+++ b/sound/soc/codecs/lpass-rx-macro.c
@@ -3426,6 +3426,13 @@ static int rx_macro_component_probe(struct snd_soc_component *component)
 static int swclk_gate_enable(struct clk_hw *hw)
 {
        struct rx_macro *rx = to_rx_macro(hw);
+       int ret;
+
+       ret = clk_prepare_enable(rx->mclk);
+       if (ret) {
+               dev_err(rx->dev, "unable to prepare mclk\n");
+               return ret;
+       }
 
        rx_macro_mclk_enable(rx, true);
        if (rx->reset_swr)
@@ -3452,6 +3459,7 @@ static void swclk_gate_disable(struct clk_hw *hw)
                           CDC_RX_SWR_CLK_EN_MASK, 0);
 
        rx_macro_mclk_enable(rx, false);
+       clk_disable_unprepare(rx->mclk);
 }
 
 static int swclk_gate_is_enabled(struct clk_hw *hw)
@@ -3488,7 +3496,7 @@ static int rx_macro_register_mclk_output(struct rx_macro *rx)
        struct clk_init_data init;
        int ret;
 
-       parent_clk_name = __clk_get_name(rx->mclk);
+       parent_clk_name = __clk_get_name(rx->npl);
 
        init.name = clk_name;
        init.ops = &swclk_gate_ops;