renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 01:04:08 +08:00
Code

ASoC: codecs: tx-macro: handle swr_reset correctly

Browse Source 
Reset soundwire block on frame sync generation clock reset.
Without this we are hitting read/write timeouts randomly during
runtime pm. Along with this remove a swr_reset redundant flag.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220906170112.1984-4-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Srinivas Kandagatla 2022-09-06 18:01:03 +01:00 committed by Mark Brown
parent 1a4e73915a
commit d83a720141
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,7 +268,6 @@ struct tx_macro {
struct clk *fsgen; struct clk *fsgen;
struct clk_hw hw; struct clk_hw hw;
bool dec_active[NUM_DECIMATORS]; bool dec_active[NUM_DECIMATORS];
bool reset_swr;
int tx_mclk_users; int tx_mclk_users;
u16 dmic_clk_div; u16 dmic_clk_div;
bool bcs_enable; bool bcs_enable;
@ -1702,18 +1701,14 @@ static int swclk_gate_enable(struct clk_hw *hw)
} }
tx_macro_mclk_enable(tx, true); tx_macro_mclk_enable(tx, true);
if (tx->reset_swr) regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, CDC_TX_SWR_RESET_MASK, CDC_TX_SWR_RESET_ENABLE);
CDC_TX_SWR_RESET_MASK,
CDC_TX_SWR_RESET_ENABLE);
regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
CDC_TX_SWR_CLK_EN_MASK, CDC_TX_SWR_CLK_EN_MASK,
CDC_TX_SWR_CLK_ENABLE); CDC_TX_SWR_CLK_ENABLE);
if (tx->reset_swr) regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, CDC_TX_SWR_RESET_MASK, 0x0);
CDC_TX_SWR_RESET_MASK, 0x0);
tx->reset_swr = false;
return 0; return 0;
} }
@ -1855,7 +1850,6 @@ static int tx_macro_probe(struct platform_device *pdev)
dev_set_drvdata(dev, tx); dev_set_drvdata(dev, tx);
tx->reset_swr = true;
tx->dev = dev; tx->dev = dev;
/* set MCLK and NPL rates */ /* set MCLK and NPL rates */
@ -1970,7 +1964,6 @@ static int __maybe_unused tx_macro_runtime_resume(struct device *dev)
regcache_cache_only(tx->regmap, false); regcache_cache_only(tx->regmap, false);
regcache_sync(tx->regmap); regcache_sync(tx->regmap);
tx->reset_swr = true;
return 0; return 0;
err_fsgen: err_fsgen: