arm64: dts: qcom: sc7280*: move MPSS and WPSS memory to dtsi

It appears that all SC7280-based devices so far have mpss_mem and
wpss_mem on the same reg with the same size.

Also these memory regions are referenced already in sc7280.dtsi so
that's where they should also be defined.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Link: https://lore.kernel.org/r/20231208-sc7280-remoteprocs-v3-4-6aa394d33edf@fairphone.com
[bjorn: delete-node &wpss_mem in qcs6490 rb3gen2, and qcm6490 idp]
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
index fc228f2854d70665a2e294368dfc1c3804a9c54e..176898c9dbbd72672dce448f4b747aef022820e3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
@@ -82,16 +82,6 @@
                        no-map;
                };
 
-               mpss_mem: mpss@8b800000 {
-                       reg = <0x0 0x8b800000 0x0 0xf600000>;
-                       no-map;
-               };
-
-               wpss_mem: wpss@9ae00000 {
-                       reg = <0x0 0x9ae00000 0x0 0x1900000>;
-                       no-map;
-               };
-
                rmtfs_mem: memory@f8500000 {
                        compatible = "qcom,rmtfs-mem";
                        reg = <0x0 0xf8500000 0x0 0x600000>;

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
index 37c91fdf3ab917b40c8ff4f4e60af09c6d442328..03e97e27d16d4abb521e5fb152d0a743d702809a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
@@ -17,6 +17,7 @@
 /delete-node/ &cdsp_mem;
 /delete-node/ &video_mem;
 /delete-node/ &wlan_ce_mem;
+/delete-node/ &wpss_mem;
 /delete-node/ &xbl_mem;
 
 / {

diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 71179cbf22b597489f116fd5c000853f9c6c72f3..8bb7d13d85f663dfb38ed75a54614fa486dbe83b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -23,6 +23,7 @@
 /delete-node/ &cdsp_mem;
 /delete-node/ &video_mem;
 /delete-node/ &wlan_ce_mem;
+/delete-node/ &wpss_mem;
 /delete-node/ &xbl_mem;
 
 / {

diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
index 854a16e018ef02d66a59ccf274abfa07987c00e2..c4d00a81da394e54650ae87adb136545cdd38cdf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
@@ -36,11 +36,6 @@
                        reg = <0x0 0x8b200000 0x0 0x500000>;
                        no-map;
                };
-
-               wpss_mem: memory@9ae00000 {
-                       reg = <0x0 0x9ae00000 0x0 0x1900000>;
-                       no-map;
-               };
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
index 203274c105321d9bab249b9cdd7f3e30938a35af..b721a8546800cc97701bc211cea9b8805030eb10 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
@@ -8,11 +8,6 @@
 
 / {
        reserved-memory {
-               mpss_mem: memory@8b800000 {
-                       reg = <0x0 0x8b800000 0x0 0xf600000>;
-                       no-map;
-               };
-
                mba_mem: memory@9c700000 {
                        reg = <0x0 0x9c700000 0x0 0x200000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi
index 2febd6126d4c84583856adbefec12da018c76b88..3ebc915f0dc2f6a5f03805f37187af4d46d55795 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi
@@ -7,5 +7,6 @@
 
 /* WIFI SKUs save 256M by not having modem/mba/rmtfs memory regions defined. */
 
+/delete-node/ &mpss_mem;
 /delete-node/ &remoteproc_mpss;
 /delete-node/ &rmtfs_mem;

diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 940a4ca68ecc71e396caf96518a2efc364a30fa2..ff1e07171dc494ae00e223a0e73c58e1234bfd20 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -168,6 +168,16 @@
                        no-map;
                };
 
+               mpss_mem: mpss@8b800000 {
+                       reg = <0x0 0x8b800000 0x0 0xf600000>;
+                       no-map;
+               };
+
+               wpss_mem: wpss@9ae00000 {
+                       reg = <0x0 0x9ae00000 0x0 0x1900000>;
+                       no-map;
+               };
+
                rmtfs_mem: rmtfs@9c900000 {
                        compatible = "qcom,rmtfs-mem";
                        reg = <0x0 0x9c900000 0x0 0x280000>;