ASoC: codecs: lpass: register mclk after runtime pm

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: c96baa2949b2 ("ASoC: codecs: wsa-macro: add runtime pm support")
Fixes: 72ad25eabda0 ("ASoC: codecs: va-macro: add runtime pm support")
Fixes: 366ff79ed539 ("ASoC: codecs: rx-macro: add runtime pm support")
Fixes: 1fb83bc5cf64 ("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>

diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
index a9ef9d5ffcc5ca1e37c718c374bdf6035e8655a8..dd6970d5eb8d1817a1c114053352d3362fd09caa 100644 (file)
--- a/sound/soc/codecs/lpass-rx-macro.c
+++ b/sound/soc/codecs/lpass-rx-macro.c
@@ -3601,10 +3601,6 @@ static int rx_macro_probe(struct platform_device *pdev)
        if (ret)
                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,
                                              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_enable(dev);
 
+       ret = rx_macro_register_mclk_output(rx);
+       if (ret)
+               goto err_clkout;
+
        return 0;
 
 err_clkout:

diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c
index 2ef62d6edc3027b78ab10aeef742d27474bcc0bb..b9475ba55e203f8872608273c1f9e86b7bfdc010 100644 (file)
--- a/sound/soc/codecs/lpass-tx-macro.c
+++ b/sound/soc/codecs/lpass-tx-macro.c
@@ -2036,10 +2036,6 @@ static int tx_macro_probe(struct platform_device *pdev)
        if (ret)
                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,
                                              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_enable(dev);
 
+       ret = tx_macro_register_mclk_output(tx);
+       if (ret)
+               goto err_clkout;
+
        return 0;
 
 err_clkout:

diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
index b0b6cf29cba30ce32d38557ab27a5df14b490b41..1623ba78ddb3d4918586243d6108576a0bf36f1d 100644 (file)
--- a/sound/soc/codecs/lpass-va-macro.c
+++ b/sound/soc/codecs/lpass-va-macro.c
@@ -1524,16 +1524,6 @@ static int va_macro_probe(struct platform_device *pdev)
        if (ret)
                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) {
                /* Set default CLK div to 1 */
                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_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;
 
 err_clkout:

diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
index 5cfe96f6e430eb52dc8c764745f28e31cabfdfe0..c0b86d69c72e3be172b573cd8b2a305cf689fe0d 100644 (file)
--- a/sound/soc/codecs/lpass-wsa-macro.c
+++ b/sound/soc/codecs/lpass-wsa-macro.c
@@ -2451,11 +2451,6 @@ static int wsa_macro_probe(struct platform_device *pdev)
        if (ret)
                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,
                                              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_enable(dev);
 
+       ret = wsa_macro_register_mclk_output(wsa);
+       if (ret)
+               goto err_clkout;
+
        return 0;
 
 err_clkout: