aboutsummaryrefslogtreecommitdiffstats
diff options
authorMatti Lehtimäki <matti.lehtimaki@gmail.com>2025-05-12 02:40:15 +0300
committerBjorn Andersson <andersson@kernel.org>2025-05-13 10:34:33 -0500
commit4ca45af0a56d00b86285d6fdd720dca3215059a7 (patch)
treed4871cd8b821e75ef3ecebc1bb28029fe46658be
parent0af2f6be1b4281385b618cb86ad946eded089ac8 (diff)
downloadlinux-rproc-fixes.tar.gz
remoteproc: qcom_wcnss: Fix on platforms without fallback regulatorsrproc-fixes
Recent change to handle platforms with only single power domain broke pronto-v3 which requires power domains and doesn't have fallback voltage regulators in case power domains are missing. Add a check to verify the number of fallback voltage regulators before using the code which handles single power domain situation. Fixes: 65991ea8a6d1 ("remoteproc: qcom_wcnss: Handle platforms with only single power domain") Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> Tested-by: Luca Weiss <luca.weiss@fairphone.com> # sdm632-fairphone-fp3 Link: https://lore.kernel.org/r/20250511234026.94735-1-matti.lehtimaki@gmail.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-rw-r--r--drivers/remoteproc/qcom_wcnss.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c
index 775b056d795a8b..2c7e519a2254ba 100644
--- a/drivers/remoteproc/qcom_wcnss.c
+++ b/drivers/remoteproc/qcom_wcnss.c
@@ -456,7 +456,8 @@ static int wcnss_init_regulators(struct qcom_wcnss *wcnss,
if (wcnss->num_pds) {
info += wcnss->num_pds;
/* Handle single power domain case */
- num_vregs += num_pd_vregs - wcnss->num_pds;
+ if (wcnss->num_pds < num_pd_vregs)
+ num_vregs += num_pd_vregs - wcnss->num_pds;
} else {
num_vregs += num_pd_vregs;
}