arm64: dts: qcom: sm8450: Fix ADSP memory base and length

commit 13c96bee5d5e5b61a9d8d000c9bb37bb9a2a0551 upstream.

The address space in ADSP PAS (Peripheral Authentication Service)
remoteproc node should point to the QDSP PUB address space
(QDSP6...SS_PUB): 0x0300_0000 with length of 0x10000, which also matches
downstream DTS.  0x3000_0000, value used so far, was in datasheet is the
region of CDSP.

Correct the base address and length, which also moves the node to
different place to keep things sorted by unit address.  The diff looks
big, but only the unit address and "reg" property were changed.  This
should have no functional impact on Linux users, because PAS loader does
not use this address space at all.

Fixes: 1172729576fb ("arm64: dts: qcom: sm8450: Add remoteproc enablers and instances")
Cc: stable@vger.kernel.org
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20241213-dts-qcom-cdsp-mpss-base-address-v3-4-2e0036fccd8d@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index f7d52e491b694b72b4e467fe2c1acd3a961c00ef..14548ca667b5815bf01d108da0d113100219f5a2 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -2492,6 +2492,112 @@
                        };
                };
 
+               remoteproc_adsp: remoteproc@3000000 {
+                       compatible = "qcom,sm8450-adsp-pas";
+                       reg = <0x0 0x03000000 0x0 0x10000>;
+
+                       interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
+
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "xo";
+
+                       power-domains = <&rpmhpd RPMHPD_LCX>,
+                                       <&rpmhpd RPMHPD_LMX>;
+                       power-domain-names = "lcx", "lmx";
+
+                       memory-region = <&adsp_mem>;
+
+                       qcom,qmp = <&aoss_qmp>;
+
+                       qcom,smem-states = <&smp2p_adsp_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       status = "disabled";
+
+                       remoteproc_adsp_glink: glink-edge {
+                               interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
+                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                            IRQ_TYPE_EDGE_RISING>;
+                               mboxes = <&ipcc IPCC_CLIENT_LPASS
+                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+
+                               label = "lpass";
+                               qcom,remote-pid = <2>;
+
+                               gpr {
+                                       compatible = "qcom,gpr";
+                                       qcom,glink-channels = "adsp_apps";
+                                       qcom,domain = <GPR_DOMAIN_ID_ADSP>;
+                                       qcom,intents = <512 20>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       q6apm: service@1 {
+                                               compatible = "qcom,q6apm";
+                                               reg = <GPR_APM_MODULE_IID>;
+                                               #sound-dai-cells = <0>;
+                                               qcom,protection-domain = "avs/audio",
+                                                                        "msm/adsp/audio_pd";
+
+                                               q6apmdai: dais {
+                                                       compatible = "qcom,q6apm-dais";
+                                                       iommus = <&apps_smmu 0x1801 0x0>;
+                                               };
+
+                                               q6apmbedai: bedais {
+                                                       compatible = "qcom,q6apm-lpass-dais";
+                                                       #sound-dai-cells = <1>;
+                                               };
+                                       };
+
+                                       q6prm: service@2 {
+                                               compatible = "qcom,q6prm";
+                                               reg = <GPR_PRM_MODULE_IID>;
+                                               qcom,protection-domain = "avs/audio",
+                                                                        "msm/adsp/audio_pd";
+
+                                               q6prmcc: clock-controller {
+                                                       compatible = "qcom,q6prm-lpass-clocks";
+                                                       #clock-cells = <2>;
+                                               };
+                                       };
+                               };
+
+                               fastrpc {
+                                       compatible = "qcom,fastrpc";
+                                       qcom,glink-channels = "fastrpcglink-apps-dsp";
+                                       label = "adsp";
+                                       qcom,non-secure-domain;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       compute-cb@3 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <3>;
+                                               iommus = <&apps_smmu 0x1803 0x0>;
+                                       };
+
+                                       compute-cb@4 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <4>;
+                                               iommus = <&apps_smmu 0x1804 0x0>;
+                                       };
+
+                                       compute-cb@5 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <5>;
+                                               iommus = <&apps_smmu 0x1805 0x0>;
+                                       };
+                               };
+                       };
+               };
+
                wsa2macro: codec@31e0000 {
                        compatible = "qcom,sm8450-lpass-wsa-macro";
                        reg = <0 0x031e0000 0 0x1000>;
@@ -2688,112 +2794,6 @@
                        status = "disabled";
                };
 
-               remoteproc_adsp: remoteproc@30000000 {
-                       compatible = "qcom,sm8450-adsp-pas";
-                       reg = <0 0x30000000 0 0x100>;
-
-                       interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "wdog", "fatal", "ready",
-                                         "handover", "stop-ack";
-
-                       clocks = <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "xo";
-
-                       power-domains = <&rpmhpd RPMHPD_LCX>,
-                                       <&rpmhpd RPMHPD_LMX>;
-                       power-domain-names = "lcx", "lmx";
-
-                       memory-region = <&adsp_mem>;
-
-                       qcom,qmp = <&aoss_qmp>;
-
-                       qcom,smem-states = <&smp2p_adsp_out 0>;
-                       qcom,smem-state-names = "stop";
-
-                       status = "disabled";
-
-                       remoteproc_adsp_glink: glink-edge {
-                               interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
-                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
-                                                            IRQ_TYPE_EDGE_RISING>;
-                               mboxes = <&ipcc IPCC_CLIENT_LPASS
-                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
-
-                               label = "lpass";
-                               qcom,remote-pid = <2>;
-
-                               gpr {
-                                       compatible = "qcom,gpr";
-                                       qcom,glink-channels = "adsp_apps";
-                                       qcom,domain = <GPR_DOMAIN_ID_ADSP>;
-                                       qcom,intents = <512 20>;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       q6apm: service@1 {
-                                               compatible = "qcom,q6apm";
-                                               reg = <GPR_APM_MODULE_IID>;
-                                               #sound-dai-cells = <0>;
-                                               qcom,protection-domain = "avs/audio",
-                                                                        "msm/adsp/audio_pd";
-
-                                               q6apmdai: dais {
-                                                       compatible = "qcom,q6apm-dais";
-                                                       iommus = <&apps_smmu 0x1801 0x0>;
-                                               };
-
-                                               q6apmbedai: bedais {
-                                                       compatible = "qcom,q6apm-lpass-dais";
-                                                       #sound-dai-cells = <1>;
-                                               };
-                                       };
-
-                                       q6prm: service@2 {
-                                               compatible = "qcom,q6prm";
-                                               reg = <GPR_PRM_MODULE_IID>;
-                                               qcom,protection-domain = "avs/audio",
-                                                                        "msm/adsp/audio_pd";
-
-                                               q6prmcc: clock-controller {
-                                                       compatible = "qcom,q6prm-lpass-clocks";
-                                                       #clock-cells = <2>;
-                                               };
-                                       };
-                               };
-
-                               fastrpc {
-                                       compatible = "qcom,fastrpc";
-                                       qcom,glink-channels = "fastrpcglink-apps-dsp";
-                                       label = "adsp";
-                                       qcom,non-secure-domain;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       compute-cb@3 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <3>;
-                                               iommus = <&apps_smmu 0x1803 0x0>;
-                                       };
-
-                                       compute-cb@4 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <4>;
-                                               iommus = <&apps_smmu 0x1804 0x0>;
-                                       };
-
-                                       compute-cb@5 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <5>;
-                                               iommus = <&apps_smmu 0x1805 0x0>;
-                                       };
-                               };
-                       };
-               };
-
                remoteproc_cdsp: remoteproc@32300000 {
                        compatible = "qcom,sm8450-cdsp-pas";
                        reg = <0 0x32300000 0 0x1400000>;