ASoC: codecs: lpass: do not reset soundwire block on clk enable

resetting soundwire block will put the slaves out of sync and result
in re-enumeration during fsgen disable/enable path this is totally
unnecessary and resulting fifo overflows.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230209122806.18923-8-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 8621cfabcf5b6885745514600b615e64ac10faa6..e0d891a67a1245e251b7213634d56b372801c187 100644 (file)
--- a/sound/soc/codecs/lpass-rx-macro.c
+++ b/sound/soc/codecs/lpass-rx-macro.c
@@ -3441,16 +3441,10 @@ static int swclk_gate_enable(struct clk_hw *hw)
        }
 
        rx_macro_mclk_enable(rx, true);
-       regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL,
-                          CDC_RX_SWR_RESET_MASK,
-                          CDC_RX_SWR_RESET);
 
        regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL,
                           CDC_RX_SWR_CLK_EN_MASK, 1);
 
-       regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL,
-                          CDC_RX_SWR_RESET_MASK, 0);
-
        return 0;
 }
 
@@ -3601,6 +3595,17 @@ static int rx_macro_probe(struct platform_device *pdev)
        if (ret)
                goto err_fsgen;
 
+       /* reset swr block  */
+       regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL,
+                          CDC_RX_SWR_RESET_MASK,
+                          CDC_RX_SWR_RESET);
+
+       regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL,
+                          CDC_RX_SWR_CLK_EN_MASK, 1);
+
+       regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL,
+                          CDC_RX_SWR_RESET_MASK, 0);
+
        ret = devm_snd_soc_register_component(dev, &rx_macro_component_drv,
                                              rx_macro_dai,
                                              ARRAY_SIZE(rx_macro_dai));

diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c
index 2449a2df66df0cfc480bfd731857893e285d15af..bf27bdd5be2067a867c0ea48bda09a1372ab6a94 100644 (file)
--- a/sound/soc/codecs/lpass-tx-macro.c
+++ b/sound/soc/codecs/lpass-tx-macro.c
@@ -1861,15 +1861,10 @@ static int swclk_gate_enable(struct clk_hw *hw)
        }
 
        tx_macro_mclk_enable(tx, true);
-       regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
-                          CDC_TX_SWR_RESET_MASK, CDC_TX_SWR_RESET_ENABLE);
 
        regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
                           CDC_TX_SWR_CLK_EN_MASK,
                           CDC_TX_SWR_CLK_ENABLE);
-       regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
-                          CDC_TX_SWR_RESET_MASK, 0x0);
-
        return 0;
 }
 
@@ -2036,6 +2031,16 @@ static int tx_macro_probe(struct platform_device *pdev)
        if (ret)
                goto err_fsgen;
 
+       /* reset soundwire block */
+       regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
+                          CDC_TX_SWR_RESET_MASK, CDC_TX_SWR_RESET_ENABLE);
+
+       regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
+                          CDC_TX_SWR_CLK_EN_MASK,
+                          CDC_TX_SWR_CLK_ENABLE);
+       regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
+                          CDC_TX_SWR_RESET_MASK, 0x0);
+
        ret = devm_snd_soc_register_component(dev, &tx_macro_component_drv,
                                              tx_macro_dai,
                                              ARRAY_SIZE(tx_macro_dai));

diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
index 1623ba78ddb3d4918586243d6108576a0bf36f1d..fd62817d29a0a5768f4d6d4ba267565de16cb3e0 100644 (file)
--- a/sound/soc/codecs/lpass-va-macro.c
+++ b/sound/soc/codecs/lpass-va-macro.c
@@ -1333,17 +1333,9 @@ static int fsgen_gate_enable(struct clk_hw *hw)
        int ret;
 
        ret = va_macro_mclk_enable(va, true);
-       if (!va->has_swr_master)
-               return ret;
-
-       regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL,
-                          CDC_VA_SWR_RESET_MASK,  CDC_VA_SWR_RESET_ENABLE);
-
-       regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL,
-                          CDC_VA_SWR_CLK_EN_MASK,
-                          CDC_VA_SWR_CLK_ENABLE);
-       regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL,
-                          CDC_VA_SWR_RESET_MASK, 0x0);
+       if (va->has_swr_master)
+               regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL,
+                                  CDC_VA_SWR_CLK_EN_MASK, CDC_VA_SWR_CLK_ENABLE);
 
        return ret;
 }
@@ -1538,6 +1530,15 @@ static int va_macro_probe(struct platform_device *pdev)
 
        }
 
+       if (va->has_swr_master) {
+               regmap_update_bits(va->regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL,
+                                  CDC_VA_SWR_RESET_MASK,  CDC_VA_SWR_RESET_ENABLE);
+               regmap_update_bits(va->regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL,
+                                  CDC_VA_SWR_CLK_EN_MASK, CDC_VA_SWR_CLK_ENABLE);
+               regmap_update_bits(va->regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL,
+                                  CDC_VA_SWR_RESET_MASK, 0x0);
+       }
+
        ret = devm_snd_soc_register_component(dev, &va_macro_component_drv,
                                              va_macro_dais,
                                              ARRAY_SIZE(va_macro_dais));

diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
index c0b86d69c72e3be172b573cd8b2a305cf689fe0d..e6b85f3692acc6fb264708259bc86cbcb31bfefc 100644 (file)
--- a/sound/soc/codecs/lpass-wsa-macro.c
+++ b/sound/soc/codecs/lpass-wsa-macro.c
@@ -2270,17 +2270,10 @@ static int wsa_swrm_clock(struct wsa_macro *wsa, bool enable)
                }
                wsa_macro_mclk_enable(wsa, true);
 
-               /* reset swr ip */
-               regmap_update_bits(regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL,
-                                  CDC_WSA_SWR_RST_EN_MASK, CDC_WSA_SWR_RST_ENABLE);
-
                regmap_update_bits(regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL,
                                   CDC_WSA_SWR_CLK_EN_MASK,
                                   CDC_WSA_SWR_CLK_ENABLE);
 
-               /* Bring out of reset */
-               regmap_update_bits(regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL,
-                                  CDC_WSA_SWR_RST_EN_MASK, CDC_WSA_SWR_RST_DISABLE);
        } else {
                regmap_update_bits(regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL,
                                   CDC_WSA_SWR_CLK_EN_MASK, 0);
@@ -2451,6 +2444,17 @@ static int wsa_macro_probe(struct platform_device *pdev)
        if (ret)
                goto err_fsgen;
 
+       /* reset swr ip */
+       regmap_update_bits(wsa->regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL,
+                          CDC_WSA_SWR_RST_EN_MASK, CDC_WSA_SWR_RST_ENABLE);
+
+       regmap_update_bits(wsa->regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL,
+                          CDC_WSA_SWR_CLK_EN_MASK, CDC_WSA_SWR_CLK_ENABLE);
+
+       /* Bring out of reset */
+       regmap_update_bits(wsa->regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL,
+                          CDC_WSA_SWR_RST_EN_MASK, CDC_WSA_SWR_RST_DISABLE);
+
        ret = devm_snd_soc_register_component(dev, &wsa_macro_component_drv,
                                              wsa_macro_dai,
                                              ARRAY_SIZE(wsa_macro_dai));