Commit 1a4e7391 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown

ASoC: codecs: rx-macro: handle swr_reset correctly

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: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220906170112.1984-3-srinivas.kandagatla@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent fdc972d4
...@@ -596,7 +596,6 @@ struct rx_macro { ...@@ -596,7 +596,6 @@ struct rx_macro {
int rx_port_value[RX_MACRO_PORTS_MAX]; int rx_port_value[RX_MACRO_PORTS_MAX];
u16 prim_int_users[INTERP_MAX]; u16 prim_int_users[INTERP_MAX];
int rx_mclk_users; int rx_mclk_users;
bool reset_swr;
int clsh_users; int clsh_users;
int rx_mclk_cnt; int rx_mclk_cnt;
bool is_ear_mode_on; bool is_ear_mode_on;
...@@ -3442,18 +3441,15 @@ static int swclk_gate_enable(struct clk_hw *hw) ...@@ -3442,18 +3441,15 @@ static int swclk_gate_enable(struct clk_hw *hw)
} }
rx_macro_mclk_enable(rx, true); rx_macro_mclk_enable(rx, true);
if (rx->reset_swr) regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL,
regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL, CDC_RX_SWR_RESET_MASK,
CDC_RX_SWR_RESET_MASK, CDC_RX_SWR_RESET);
CDC_RX_SWR_RESET);
regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL, regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL,
CDC_RX_SWR_CLK_EN_MASK, 1); CDC_RX_SWR_CLK_EN_MASK, 1);
if (rx->reset_swr) regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL,
regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL, CDC_RX_SWR_RESET_MASK, 0);
CDC_RX_SWR_RESET_MASK, 0);
rx->reset_swr = false;
return 0; return 0;
} }
...@@ -3579,7 +3575,6 @@ static int rx_macro_probe(struct platform_device *pdev) ...@@ -3579,7 +3575,6 @@ static int rx_macro_probe(struct platform_device *pdev)
dev_set_drvdata(dev, rx); dev_set_drvdata(dev, rx);
rx->reset_swr = true;
rx->dev = dev; rx->dev = dev;
/* set MCLK and NPL rates */ /* set MCLK and NPL rates */
...@@ -3701,7 +3696,6 @@ static int __maybe_unused rx_macro_runtime_resume(struct device *dev) ...@@ -3701,7 +3696,6 @@ static int __maybe_unused rx_macro_runtime_resume(struct device *dev)
} }
regcache_cache_only(rx->regmap, false); regcache_cache_only(rx->regmap, false);
regcache_sync(rx->regmap); regcache_sync(rx->regmap);
rx->reset_swr = true;
return 0; return 0;
err_fsgen: err_fsgen:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment