This reverts commit 7b642273438cf500d36cffde145b9739fa525c1d which is commit 1dc3459009c33e335f0d62b84dd39a6bbd7fd5d2 upstream.
This patch broke RB5 (Qualcomm SM8250) devboard. The device reboots into USB crash dump mode after following error:
qcom_q6v5_pas 17300000.remoteproc: fatal error received: \ ABT_dal.c:278:ABTimeout: AHB Bus hang is detected, \ Number of bus hang detected := 2 , addr0 = 0x3370000 , addr1 = 0x0!!!
Signed-off-by: Amit Pundir amit.pundir@linaro.org --- sound/soc/codecs/lpass-rx-macro.c | 8 ++++---- sound/soc/codecs/lpass-tx-macro.c | 8 ++++---- sound/soc/codecs/lpass-va-macro.c | 20 ++++++++++---------- sound/soc/codecs/lpass-wsa-macro.c | 9 +++++---- 4 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 8621cfabcf5b..92e61f2206cb 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3601,6 +3601,10 @@ 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)); @@ -3614,10 +3618,6 @@ 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 5d1c58df081a..33760213f406 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1889,6 +1889,10 @@ 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)); @@ -1901,10 +1905,6 @@ 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 1623ba78ddb3..b0b6cf29cba3 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -1524,6 +1524,16 @@ 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, @@ -1550,16 +1560,6 @@ 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 c012033fb69e..5e0abefe7cce 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2449,6 +2449,11 @@ 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)); @@ -2461,10 +2466,6 @@ 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: