Commit eaba1134 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown

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: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220224111718.6264-10-srinivas.kandagatla@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 31bd0db8
...@@ -3426,6 +3426,13 @@ static int rx_macro_component_probe(struct snd_soc_component *component) ...@@ -3426,6 +3426,13 @@ static int rx_macro_component_probe(struct snd_soc_component *component)
static int swclk_gate_enable(struct clk_hw *hw) static int swclk_gate_enable(struct clk_hw *hw)
{ {
struct rx_macro *rx = to_rx_macro(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); rx_macro_mclk_enable(rx, true);
if (rx->reset_swr) if (rx->reset_swr)
...@@ -3452,6 +3459,7 @@ static void swclk_gate_disable(struct clk_hw *hw) ...@@ -3452,6 +3459,7 @@ static void swclk_gate_disable(struct clk_hw *hw)
CDC_RX_SWR_CLK_EN_MASK, 0); CDC_RX_SWR_CLK_EN_MASK, 0);
rx_macro_mclk_enable(rx, false); rx_macro_mclk_enable(rx, false);
clk_disable_unprepare(rx->mclk);
} }
static int swclk_gate_is_enabled(struct clk_hw *hw) 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) ...@@ -3488,7 +3496,7 @@ static int rx_macro_register_mclk_output(struct rx_macro *rx)
struct clk_init_data init; struct clk_init_data init;
int ret; int ret;
parent_clk_name = __clk_get_name(rx->mclk); parent_clk_name = __clk_get_name(rx->npl);
init.name = clk_name; init.name = clk_name;
init.ops = &swclk_gate_ops; init.ops = &swclk_gate_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment