From 5bdf50d13b5c430be6dec505c92530cb2cf1f2f3 Mon Sep 17 00:00:00 2001 From: Stijn Segers Date: Wed, 6 Jan 2021 22:45:18 +0100 Subject: [PATCH] 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 [add missing block for dgs-1210-10p, move block below chosen node] Signed-off-by: Adrian Schmutzler --- target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts | 5 +++++ 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-10p.dts | 5 +++++ target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi | 5 +++++ target/linux/realtek/dts/rtl838x.dtsi | 5 ----- 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts b/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts index 80699df291..251585a8da 100644 --- 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 ce6085b28e..b316710388 100644 --- 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 a5dd3be0a4..28c4fd2970 100644 --- 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 05010ffc0d..a2ebdad11b 100644 --- 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 74043c097a..e41c6f9f22 100644 --- 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 15d518578b..36d8847a15 100644 --- 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"; }; -- 2.30.2