OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
38e7d9c
)
remoteproc: qcom: q6v5: Fix missing clk_disable_unprepare() in q6v5_wcss_qcs404_power...
author
Shang XiaoJing
<shangxiaojing@huawei.com>
Sun, 4 Dec 2022 08:27:57 +0000
(16:27 +0800)
committer
Bjorn Andersson
<andersson@kernel.org>
Wed, 7 Dec 2022 04:34:13 +0000
(22:34 -0600)
q6v5_wcss_qcs404_power_on() have no fail path for readl_poll_timeout().
Add fail path for readl_poll_timeout().
Fixes:
0af65b9b915e
("remoteproc: qcom: wcss: Add non pas wcss Q6 support for QCS404")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link:
https://lore.kernel.org/r/20221204082757.18850-1-shangxiaojing@huawei.com
drivers/remoteproc/qcom_q6v5_wcss.c
patch
|
blob
|
history
diff --git
a/drivers/remoteproc/qcom_q6v5_wcss.c
b/drivers/remoteproc/qcom_q6v5_wcss.c
index
de23233
..
ba24d74
100644
(file)
--- a/
drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/
drivers/remoteproc/qcom_q6v5_wcss.c
@@
-351,7
+351,7
@@
static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss)
if (ret) {
dev_err(wcss->dev,
"xo cbcr enabling timed out (rc:%d)\n", ret);
-
return ret
;
+
goto disable_xo_cbcr_clk
;
}
writel(0, wcss->reg_base + Q6SS_CGC_OVERRIDE);
@@
-417,6
+417,7
@@
disable_sleep_cbcr_clk:
val = readl(wcss->reg_base + Q6SS_SLEEP_CBCR);
val &= ~Q6SS_CLK_ENABLE;
writel(val, wcss->reg_base + Q6SS_SLEEP_CBCR);
+disable_xo_cbcr_clk:
val = readl(wcss->reg_base + Q6SS_XO_CBCR);
val &= ~Q6SS_CLK_ENABLE;
writel(val, wcss->reg_base + Q6SS_XO_CBCR);