aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2023-01-17 13:44:25 +0000
committerSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2023-01-17 13:44:25 +0000
commit685048b7a242b5bcc0041c5e3e701492a992651c (patch)
tree038228635a5459453ef94455646afb2f99a36102
parente4a508f81c5d19b08e2f97f582aed1dc16bb2c62 (diff)
soundwire: qcom: wait for clk stop to finish and remove prep/exit
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-rw-r--r--drivers/soundwire/qcom.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index 5d60f602c20fa..783e29df16260 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -1612,13 +1612,10 @@ static int __maybe_unused swrm_runtime_resume(struct device *dev)
ctrl->reg_write(ctrl, SWRM_INTERRUPT_MASK_ADDR, ctrl->intr_mask);
ctrl->reg_write(ctrl, SWRM_INTERRUPT_CPU_EN, ctrl->intr_mask);
- usleep_range(100, 105);
+ usleep_range(500, 505);
if (!swrm_wait_for_frame_gen_enabled(ctrl))
dev_err(ctrl->dev, "link failed to connect\n");
- ret = sdw_bus_exit_clk_stop(&ctrl->bus);
- if (ret < 0)
- dev_err(ctrl->dev, "bus failed to exit clock stop %d\n", ret);
}
dev_err(ctrl->dev, " %s: done \n", __func__);
@@ -1637,11 +1634,6 @@ static int __maybe_unused swrm_runtime_suspend(struct device *dev)
ctrl->reg_write(ctrl, SWRM_INTERRUPT_MASK_ADDR, ctrl->intr_mask);
ctrl->reg_write(ctrl, SWRM_INTERRUPT_CPU_EN, ctrl->intr_mask);
/* Prepare slaves for clock stop */
- ret = sdw_bus_prep_clk_stop(&ctrl->bus);
- if (ret < 0 && ret != -ENODATA) {
- dev_err(dev, "prepare clock stop failed %d", ret);
- return ret;
- }
ret = sdw_bus_clk_stop(&ctrl->bus);
if (ret < 0 && ret != -ENODATA) {