Skip to content

Commit 7e81fa8

Browse files
mrnukeandersson
authored andcommitted
remoteproc: qcom_q6v5_wcss: fix parsing of qcom,halt-regs
The "qcom,halt-regs" consists of a phandle reference followed by the three offsets within syscon for halt registers. Thus, we need to request 4 integers from of_property_read_variable_u32_array(), with the halt_reg ofsets at indexes 1, 2, and 3. Offset 0 is the phandle. With MAX_HALT_REG at 3, of_property_read_variable_u32_array() returns -EOVERFLOW, causing .probe() to fail. Increase MAX_HALT_REG to 4, and update the indexes accordingly. Fixes: 0af65b9 ("remoteproc: qcom: wcss: Add non pas wcss Q6 support for QCS404") Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Link: https://lore.kernel.org/r/20251129013207.3981517-1-mr.nuke.me@gmail.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent cda5dc1 commit 7e81fa8

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/remoteproc/qcom_q6v5_wcss.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
#define TCSR_WCSS_CLK_MASK 0x1F
8686
#define TCSR_WCSS_CLK_ENABLE 0x14
8787

88-
#define MAX_HALT_REG 3
88+
#define MAX_HALT_REG 4
8989
enum {
9090
WCSS_IPQ8074,
9191
WCSS_QCS404,
@@ -864,9 +864,9 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss,
864864
return -EINVAL;
865865
}
866866

867-
wcss->halt_q6 = halt_reg[0];
868-
wcss->halt_wcss = halt_reg[1];
869-
wcss->halt_nc = halt_reg[2];
867+
wcss->halt_q6 = halt_reg[1];
868+
wcss->halt_wcss = halt_reg[2];
869+
wcss->halt_nc = halt_reg[3];
870870

871871
return 0;
872872
}

0 commit comments

Comments
 (0)