korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 08:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: codecs: lpass: register mclk after runtime pm

Browse Source 
move mclk out registration after runtime pm is enabled so that the
clk framework can resume the codec if it requires to enable the mclk out.

Fixes: c96baa2949 ("ASoC: codecs: wsa-macro: add runtime pm support")
Fixes: 72ad25eabd ("ASoC: codecs: va-macro: add runtime pm support")
Fixes: 366ff79ed5 ("ASoC: codecs: rx-macro: add runtime pm support")
Fixes: 1fb83bc5cf ("ASoC: codecs: tx-macro: add runtime pm support")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230209122806.18923-6-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Srinivas Kandagatla 2023-02-09 12:28:03 +00:00 committed by Mark Brown
parent dd33c2e7b2
commit 1dc3459009
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/lpass-rx-macro.c
View File

@ -3601,10 +3601,6 @@ static int rx_macro_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_fsgen; goto err_fsgen;
ret = rx_macro_register_mclk_output(rx);
if (ret)
goto err_clkout;
ret = devm_snd_soc_register_component(dev, &rx_macro_component_drv, ret = devm_snd_soc_register_component(dev, &rx_macro_component_drv,
rx_macro_dai, rx_macro_dai,
ARRAY_SIZE(rx_macro_dai)); ARRAY_SIZE(rx_macro_dai));
@ -3618,6 +3614,10 @@ static int rx_macro_probe(struct platform_device *pdev)
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
pm_runtime_enable(dev); pm_runtime_enable(dev);
ret = rx_macro_register_mclk_output(rx);
if (ret)
goto err_clkout;
return 0; return 0;
err_clkout: err_clkout:

8
sound/soc/codecs/lpass-tx-macro.c
View File

@ -2036,10 +2036,6 @@ static int tx_macro_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_fsgen; goto err_fsgen;
ret = tx_macro_register_mclk_output(tx);
if (ret)
goto err_clkout;
ret = devm_snd_soc_register_component(dev, &tx_macro_component_drv, ret = devm_snd_soc_register_component(dev, &tx_macro_component_drv,
tx_macro_dai, tx_macro_dai,
ARRAY_SIZE(tx_macro_dai)); ARRAY_SIZE(tx_macro_dai));
@ -2052,6 +2048,10 @@ static int tx_macro_probe(struct platform_device *pdev)
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
pm_runtime_enable(dev); pm_runtime_enable(dev);
ret = tx_macro_register_mclk_output(tx);
if (ret)
goto err_clkout;
return 0; return 0;
err_clkout: err_clkout:

20
sound/soc/codecs/lpass-va-macro.c
View File

@ -1524,16 +1524,6 @@ static int va_macro_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_mclk; goto err_mclk;
ret = va_macro_register_fsgen_output(va);
if (ret)
goto err_clkout;
va->fsgen = clk_hw_get_clk(&va->hw, "fsgen");
if (IS_ERR(va->fsgen)) {
ret = PTR_ERR(va->fsgen);
goto err_clkout;
}
if (va->has_swr_master) { if (va->has_swr_master) {
/* Set default CLK div to 1 */ /* Set default CLK div to 1 */
regmap_update_bits(va->regmap, CDC_VA_TOP_CSR_SWR_MIC_CTL0, regmap_update_bits(va->regmap, CDC_VA_TOP_CSR_SWR_MIC_CTL0,
@ -1560,6 +1550,16 @@ static int va_macro_probe(struct platform_device *pdev)
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
pm_runtime_enable(dev); pm_runtime_enable(dev);
ret = va_macro_register_fsgen_output(va);
if (ret)
goto err_clkout;
va->fsgen = clk_hw_get_clk(&va->hw, "fsgen");
if (IS_ERR(va->fsgen)) {
ret = PTR_ERR(va->fsgen);
goto err_clkout;
}
return 0; return 0;
err_clkout: err_clkout:

9
sound/soc/codecs/lpass-wsa-macro.c
View File

@ -2451,11 +2451,6 @@ static int wsa_macro_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_fsgen; goto err_fsgen;
ret = wsa_macro_register_mclk_output(wsa);
if (ret)
goto err_clkout;
ret = devm_snd_soc_register_component(dev, &wsa_macro_component_drv, ret = devm_snd_soc_register_component(dev, &wsa_macro_component_drv,
wsa_macro_dai, wsa_macro_dai,
ARRAY_SIZE(wsa_macro_dai)); ARRAY_SIZE(wsa_macro_dai));
@ -2468,6 +2463,10 @@ static int wsa_macro_probe(struct platform_device *pdev)
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
pm_runtime_enable(dev); pm_runtime_enable(dev);
ret = wsa_macro_register_mclk_output(wsa);
if (ret)
goto err_clkout;
return 0; return 0;
err_clkout: err_clkout: