diff mbox series

[7/7] arm64: dts: qcom: msm8976: Fix smsm ipc bit shifts

Message ID 20230723140712.9438-8-a39.skl@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show
Series MSM8976 PLL,RPMPD and DTS changes. | expand

Commit Message

Adam Skladowski July 23, 2023, 2:06 p.m. UTC
Update bits to match downstream irq-bitmask values.
Fixes: 0484d3ce0902 ("arm64: dts: qcom: Add DTS for MSM8976 and MSM8956 SoCs")

Signed-off-by: Adam Skladowski <a39.skl@gmail.com>
---
 arch/arm64/boot/dts/qcom/msm8976.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Marijn Suijten July 23, 2023, 4:28 p.m. UTC | #1
On 2023-07-23 16:06:54, Adam Skladowski wrote:
> Update bits to match downstream irq-bitmask values.
> Fixes: 0484d3ce0902 ("arm64: dts: qcom: Add DTS for MSM8976 and MSM8956 SoCs")
> 

This whitespace should be the other way around.  And Fixes: patches
should typically be at the beginning of the series to show that they do
are independent of the rest of the series.

> Signed-off-by: Adam Skladowski <a39.skl@gmail.com>
> ---
>  arch/arm64/boot/dts/qcom/msm8976.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8976.dtsi b/arch/arm64/boot/dts/qcom/msm8976.dtsi
> index 7385d5edec04..5537ec049451 100644
> --- a/arch/arm64/boot/dts/qcom/msm8976.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8976.dtsi
> @@ -433,9 +433,9 @@ smsm {
>  		#address-cells = <1>;
>  		#size-cells = <0>;
>  
> -		qcom,ipc-1 = <&apcs 8 12>;
> +		qcom,ipc-1 = <&apcs 8 13>;

This now overlaps with smp2p-modem which also has 13, but should be 14
according to my downstream 8956 sources:

    qcom,irq-bitmask = <0x4000>;

>  		qcom,ipc-2 = <&apcs 8 9>;
> -		qcom,ipc-3 = <&apcs 8 18>;
> +		qcom,ipc-3 = <&apcs 8 19>;

And for wcnss the smp2p-wcnss node in mainline currently has 17 but that
mask (0x20000) is used downstream for smd-wcnss; smp2p-wcnss downstream
has 0x40000 equalling a shift of 18.  Perhaps more apcs ipc references
need to be fixed before this is complete?

- Marijn

>  
>  		apps_smsm: apps@0 {
>  			reg = <0>;
> -- 
> 2.41.0
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/msm8976.dtsi b/arch/arm64/boot/dts/qcom/msm8976.dtsi
index 7385d5edec04..5537ec049451 100644
--- a/arch/arm64/boot/dts/qcom/msm8976.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8976.dtsi
@@ -433,9 +433,9 @@  smsm {
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		qcom,ipc-1 = <&apcs 8 12>;
+		qcom,ipc-1 = <&apcs 8 13>;
 		qcom,ipc-2 = <&apcs 8 9>;
-		qcom,ipc-3 = <&apcs 8 18>;
+		qcom,ipc-3 = <&apcs 8 19>;
 
 		apps_smsm: apps@0 {
 			reg = <0>;