realtek: move memory node to device DTS

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@volatilesystems.org>
[add missing block for dgs-1210-10p, move block below chosen node]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts b/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
index 80699df2919da7a67500423f195e211842b410e0..251585a8dafbdf7b712889fb008525a42e36004d 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
@@ -13,6 +13,11 @@
                bootargs = "console=ttyS0,115200";
        };
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x8000000>;
+       };
+
        keys {
                compatible = "gpio-keys-polled";
                poll-interval = <20>;

diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
index ce6085b28e0c0e363513913e96dffaa60b943bdf..b316710388c5337114def0794b40acacd1013435 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
@@ -20,6 +20,11 @@
                bootargs = "console=ttyS0,115200";
        };
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x8000000>;
+       };
+
        gpio1: rtl8231-gpio {
                status = "okay";
 

diff --git a/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts b/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
index a5dd3be0a4ab666bbe89a2d632676497d78649bb..28c4fd2970ba326e453a3541560a8f37b60826fd 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
+++ b/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
@@ -20,6 +20,11 @@
                bootargs = "console=ttyS0,115200";
        };
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x8000000>;
+       };
+
        keys {
                compatible = "gpio-keys-polled";
                poll-interval = <20>;

diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
index 05010ffc0dce902ab0069d5094eafe6d3059c2c7..a2ebdad11be012fda0f8d19f4e82696363fc214e 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
@@ -20,6 +20,11 @@
                bootargs = "console=ttyS0,115200";
        };
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x8000000>;
+       };
+
        leds {
                compatible = "gpio-leds";
 

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 74043c097af84c588b727077405412e029acc9f0..e41c6f9f22e19eb72cf60b720ea21a5a43f15714 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi
@@ -17,6 +17,11 @@
                bootargs = "console=ttyS0,115200";
        };
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x8000000>;
+       };
+
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/realtek/dts/rtl838x.dtsi b/target/linux/realtek/dts/rtl838x.dtsi
index 15d518578b305f1291e0d2cf38e2366cf5407416..36d8847a154e2422f0788c080efcfe643283f7a5 100644 (file)
--- a/target/linux/realtek/dts/rtl838x.dtsi
+++ b/target/linux/realtek/dts/rtl838x.dtsi
@@ -64,11 +64,6 @@
                };
        };
 
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x8000000>;
-       };
-
        chosen {
                bootargs = "console=ttyS0,38400";
        };