aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2023-01-17 13:44:25 +0000
committerManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>2023-01-24 12:10:19 +0530
commit4e2549bcdfb32384546b7465f27abb02d864d80b (patch)
tree0836a2c3ac113eb522f6fce61b8e610eb76e4b35
parent71623d9b22e2e7ff5486dbfa08e16fb6e83b7168 (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 5d60f602c20f..783e29df1626 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) {