ARM: dts: qcom-msm8974: Convert ADSP to a MMIO device

The cx-supply has been removed as it's supposed to be set on a
per-board basis.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220415115633.575010-17-konrad.dybcio@somainline.org

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 35d595a2796f49862173bd1d92bc5653feb8881a..606d1a57c39f18b92f3c2050f28cb739bfeca33c 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -339,36 +339,6 @@
                clock-frequency = <19200000>;
        };
 
-       remoteproc_adsp: adsp-pil {
-               compatible = "qcom,msm8974-adsp-pil";
-
-               interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,
-                                     <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
-                                     <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
-                                     <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
-                                     <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
-               interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
-
-               cx-supply = <&pm8841_s2>;
-
-               clocks = <&xo_board>;
-               clock-names = "xo";
-
-               memory-region = <&adsp_region>;
-
-               qcom,smem-states = <&adsp_smp2p_out 0>;
-               qcom,smem-state-names = "stop";
-
-               smd-edge {
-                       interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
-
-                       qcom,ipc = <&apcs 8 8>;
-                       qcom,smd-edge = <1>;
-
-                       label = "lpass";
-               };
-       };
-
        smem {
                compatible = "qcom,smem";
 
@@ -1590,6 +1560,36 @@
                        };
                };
 
+               remoteproc_adsp: remoteproc@fe200000 {
+                       compatible = "qcom,msm8974-adsp-pil";
+                       reg = <0xfe200000 0x100>;
+
+                       interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,
+                                              <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                              <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                                              <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                                              <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
+
+                       clocks = <&xo_board>;
+                       clock-names = "xo";
+
+                       memory-region = <&adsp_region>;
+
+                       qcom,smem-states = <&adsp_smp2p_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       smd-edge {
+                               interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
+
+                               qcom,ipc = <&apcs 8 8>;
+                               qcom,smd-edge = <1>;
+                               label = "lpass";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
+               };
+
                imem: imem@fe805000 {
                        status = "disabled";
                        compatible = "syscon", "simple-mfd";