[PATCH 2/5] realtek: move memory node to device DTS

[Stijn Segers]

Move the memory out of the rtl838x.dtsi and into the device family DTSI
or device DTS if applicable. This aligns with upstream practice.

Signed-off-by: Stijn Segers <foss at volatilesystems.org>
---
 target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts | 6 +++++-
 target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts   | 5 +++++
 target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts  | 5 +++++
 target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi    | 5 +++++
 target/linux/realtek/dts/rtl838x.dtsi                    | 5 -----
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts b/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
index 1bf175b7bf..46b79d658a 100644
--- a/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/dts-v1/;
 
 #include "rtl838x.dtsi"
 
@@ -10,6 +9,11 @@
 	compatible = "netgear,gs110tpp-v1", "realtek,rtl838x-soc";
 	model = "Netgear GS110TPP";
 
+	memory at 0 {
+		device_type = "memory";
+		reg = <0x0 0x8000000>;
+	};
+
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
index 4458acee2e..90368c77a3 100644
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
@@ -10,6 +10,11 @@
 	compatible = "zyxel,gs1900-10hp", "realtek,rtl838x-soc";
 	model = "Zyxel GS1900-10HP Switch";
 
+	memory at 0 {
+		device_type = "memory";
+		reg = <0x0 0x8000000>;
+	};
+
 	aliases {
 		led-boot = &led_sys;
 		led-failsafe = &led_sys;
diff --git a/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts b/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
index a5dd3be0a4..939db72e38 100644
--- a/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
+++ b/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
@@ -9,6 +9,11 @@
 	compatible = "allnet,all-sg8208m", "realtek,rtl838x-soc";
 	model = "ALLNET ALL-SG8208M";
 
+	memory at 0 {
+		device_type = "memory";
+		reg = <0x0 0x8000000>;
+	};
+
 	aliases {
 		led-boot = &led_sys;
 		led-failsafe = &led_sys;
diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi
index 74043c097a..480f84e3f5 100644
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi
@@ -6,6 +6,11 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+	memory at 0 {
+		device_type = "memory";
+		reg = <0x0 0x8000000>;
+	};
+
 	aliases {
 		led-boot = &led_power;
 		led-failsafe = &led_power;
diff --git a/target/linux/realtek/dts/rtl838x.dtsi b/target/linux/realtek/dts/rtl838x.dtsi
index 15d518578b..36d8847a15 100644
--- a/target/linux/realtek/dts/rtl838x.dtsi
+++ b/target/linux/realtek/dts/rtl838x.dtsi
@@ -64,11 +64,6 @@
 		};
 	};
 
-	memory at 0 {
-		device_type = "memory";
-		reg = <0x0 0x8000000>;
-	};
-
 	chosen {
 		bootargs = "console=ttyS0,38400";
 	};
-- 
2.20.1