qualcommax: ipq60xx: apply the 512 MB memory layout on 512 MB boardsHEADmastermain

ipq6018-cp-cpu.dtsi includes ipq6018-mp5496.dtsi, which includes
ipq6018.dtsi again and restores the 85 MB q6_region over the 55 MB one
from ipq6018-512m.dtsi. The 360 V6, AP120C-AX, FAP650, MR7500, RBR350
and RBS350 lose 30 MB of RAM this way. The MR7350 and WAX214 have
512 MB and set qcom,ath11k-fw-memory-mode = <1>, but do not include the
512 MB layout at all.

Drop the SoC include from ipq6018-512m.dtsi and include the layout after
ipq6018-cp-cpu.dtsi. The q6_region size is the only change in the
compiled device trees of these boards; the trees of the other IPQ60xx
boards do not change.

Not run on these boards, which are not available here.

Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Julius Bairaktaris <julius@bairaktaris.de>
Link: https://github.com/openwrt/openwrt/pull/25952
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

11 files changed, 15 insertions, 7 deletions

diff --git a/target/linux/qualcommax/dts/ipq6000-360v6.dts b/target/linux/qualcommax/dts/ipq6000-360v6.dts
index a20834c2b6..5bee0884c2 100644
--- a/target/linux/qualcommax/dts/ipq6000-360v6.dts
+++ b/target/linux/qualcommax/dts/ipq6000-360v6.dts
@@ -2,9 +2,10 @@
 
 /dts-v1/;
 
-#include "ipq6018-512m.dtsi"
+#include "ipq6018.dtsi"
 #include "ipq6018-ess.dtsi"
 #include "ipq6018-cp-cpu.dtsi"
+#include "ipq6018-512m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/dts/ipq6000-ap120c-ax.dts b/target/linux/qualcommax/dts/ipq6000-ap120c-ax.dts
index c761211289..d1222b7940 100644
--- a/target/linux/qualcommax/dts/ipq6000-ap120c-ax.dts
+++ b/target/linux/qualcommax/dts/ipq6000-ap120c-ax.dts
@@ -2,9 +2,10 @@
 
 /dts-v1/;
 
-#include "ipq6018-512m.dtsi"
+#include "ipq6018.dtsi"
 #include "ipq6018-ess.dtsi"
 #include "ipq6018-cp-cpu.dtsi"
+#include "ipq6018-512m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/dts/ipq6000-glinet.dtsi b/target/linux/qualcommax/dts/ipq6000-glinet.dtsi
index b9508b1286..aba208586e 100644
--- a/target/linux/qualcommax/dts/ipq6000-glinet.dtsi
+++ b/target/linux/qualcommax/dts/ipq6000-glinet.dtsi
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
+#include "ipq6018.dtsi"
 #include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 
diff --git a/target/linux/qualcommax/dts/ipq6000-link.dtsi b/target/linux/qualcommax/dts/ipq6000-link.dtsi
index 13c5a939ec..c5874bf10a 100644
--- a/target/linux/qualcommax/dts/ipq6000-link.dtsi
+++ b/target/linux/qualcommax/dts/ipq6000-link.dtsi
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
+#include "ipq6018.dtsi"
 #include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 
diff --git a/target/linux/qualcommax/dts/ipq6000-mr7350.dts b/target/linux/qualcommax/dts/ipq6000-mr7350.dts
index 47a39c7db6..ed5bc78f46 100644
--- a/target/linux/qualcommax/dts/ipq6000-mr7350.dts
+++ b/target/linux/qualcommax/dts/ipq6000-mr7350.dts
@@ -4,6 +4,7 @@
 
 #include "ipq6018.dtsi"
 #include "ipq6018-cp-cpu.dtsi"
+#include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/dts/ipq6000-re-ss-01.dts b/target/linux/qualcommax/dts/ipq6000-re-ss-01.dts
index 113ec85de1..6872b1e1c5 100644
--- a/target/linux/qualcommax/dts/ipq6000-re-ss-01.dts
+++ b/target/linux/qualcommax/dts/ipq6000-re-ss-01.dts
@@ -2,6 +2,7 @@
 
 /dts-v1/;
 
+#include "ipq6018.dtsi"
 #include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 
diff --git a/target/linux/qualcommax/dts/ipq6010-wax214.dts b/target/linux/qualcommax/dts/ipq6010-wax214.dts
index 5df12f4ed6..b99523261c 100644
--- a/target/linux/qualcommax/dts/ipq6010-wax214.dts
+++ b/target/linux/qualcommax/dts/ipq6010-wax214.dts
@@ -4,6 +4,7 @@
 
 #include "ipq6018.dtsi"
 #include "ipq6018-cp-cpu.dtsi"
+#include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/dts/ipq6018-fap650.dts b/target/linux/qualcommax/dts/ipq6018-fap650.dts
index 5fc8e379f6..5337e7dca7 100644
--- a/target/linux/qualcommax/dts/ipq6018-fap650.dts
+++ b/target/linux/qualcommax/dts/ipq6018-fap650.dts
@@ -3,8 +3,9 @@
 
 /dts-v1/;
 
-#include "ipq6018-512m.dtsi"
+#include "ipq6018.dtsi"
 #include "ipq6018-cp-cpu.dtsi"
+#include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/dts/ipq6018-mr7500.dts b/target/linux/qualcommax/dts/ipq6018-mr7500.dts
index c9f706a719..34382a81f6 100644
--- a/target/linux/qualcommax/dts/ipq6018-mr7500.dts
+++ b/target/linux/qualcommax/dts/ipq6018-mr7500.dts
@@ -3,8 +3,9 @@
 
 /dts-v1/;
 
-#include "ipq6018-512m.dtsi"
+#include "ipq6018.dtsi"
 #include "ipq6018-cp-cpu.dtsi"
+#include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/dts/ipq6018-rbx350.dtsi b/target/linux/qualcommax/dts/ipq6018-rbx350.dtsi
index 519a52f4aa..288af7f1bc 100644
--- a/target/linux/qualcommax/dts/ipq6018-rbx350.dtsi
+++ b/target/linux/qualcommax/dts/ipq6018-rbx350.dtsi
@@ -1,5 +1,6 @@
-#include "ipq6018-512m.dtsi"
+#include "ipq6018.dtsi"
 #include "ipq6018-cp-cpu.dtsi"
+#include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-512m.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-512m.dtsi
index 6ea3291026..36e7a1c644 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-512m.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-512m.dtsi
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include "ipq6018.dtsi"
-
 &q6_region {
 	reg = <0x0 0x4ab00000 0x0 0x3700000>;
 };