mips: dts: realtek: Fold rtl83xx into rtl838x

rtl83xx.dtsi was once (presumably) created as a base for both RTL838x
and RTL839x SoCs. Both SoCs have a different CPU and the peripherals
require different compatibles. Fold rtl83xx.dtsi into rtl838x.dtsi,
currently only supporting RTL838x SoCs, and create the RTL839x base
include later when required.

Signed-off-by: Sander Vanheule <sander@svanheule.net>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/boot/dts/realtek/cisco_sg220-26.dts b/arch/mips/boot/dts/realtek/cisco_sg220-26.dts
index 1cdbb09297ef9c335f063ccc655794b93849d2df..cb85d172a1d37972167f3236e1fde615c59dfc21 100644 (file)
--- a/arch/mips/boot/dts/realtek/cisco_sg220-26.dts
+++ b/arch/mips/boot/dts/realtek/cisco_sg220-26.dts
@@ -2,7 +2,6 @@
 
 /dts-v1/;
 
-#include "rtl83xx.dtsi"
 #include "rtl838x.dtsi"
 
 / {

diff --git a/arch/mips/boot/dts/realtek/rtl838x.dtsi b/arch/mips/boot/dts/realtek/rtl838x.dtsi
index d2c6baabb38ce4a726daf98eb6eb8de42f54ccd4..90744909453652c11a0bf2dac6ba64677f87c4eb 100644 (file)
--- a/arch/mips/boot/dts/realtek/rtl838x.dtsi
+++ b/arch/mips/boot/dts/realtek/rtl838x.dtsi
@@ -1,6 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -18,4 +26,52 @@
                #clock-cells = <0>;
                clock-frequency = <500000000>;
        };
+
+       cpuintc: cpuintc {
+               compatible = "mti,cpu-interrupt-controller";
+               #address-cells = <0>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+       };
+
+       soc@18000000 {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0x0 0x18000000 0x10000>;
+
+               uart0: serial@2000 {
+                       compatible = "ns16550a";
+                       reg = <0x2000 0x100>;
+
+                       clock-frequency = <200000000>;
+
+                       interrupt-parent = <&cpuintc>;
+                       interrupts = <31>;
+
+                       reg-io-width = <1>;
+                       reg-shift = <2>;
+                       fifo-size = <1>;
+                       no-loopback-test;
+
+                       status = "disabled";
+               };
+
+               uart1: serial@2100 {
+                       compatible = "ns16550a";
+                       reg = <0x2100 0x100>;
+
+                       clock-frequency = <200000000>;
+
+                       interrupt-parent = <&cpuintc>;
+                       interrupts = <30>;
+
+                       reg-io-width = <1>;
+                       reg-shift = <2>;
+                       fifo-size = <1>;
+                       no-loopback-test;
+
+                       status = "disabled";
+               };
+       };
 };

diff --git a/arch/mips/boot/dts/realtek/rtl83xx.dtsi b/arch/mips/boot/dts/realtek/rtl83xx.dtsi
deleted file mode 100644 (file)
index 1039cb5..0000000
--- a/arch/mips/boot/dts/realtek/rtl83xx.dtsi
+++ /dev/null
@@ -1,59 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       aliases {
-               serial0 = &uart0;
-               serial1 = &uart1;
-       };
-
-       cpuintc: cpuintc {
-               compatible = "mti,cpu-interrupt-controller";
-               #address-cells = <0>;
-               #interrupt-cells = <1>;
-               interrupt-controller;
-       };
-
-       soc@18000000 {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges = <0x0 0x18000000 0x10000>;
-
-               uart0: serial@2000 {
-                       compatible = "ns16550a";
-                       reg = <0x2000 0x100>;
-
-                       clock-frequency = <200000000>;
-
-                       interrupt-parent = <&cpuintc>;
-                       interrupts = <31>;
-
-                       reg-io-width = <1>;
-                       reg-shift = <2>;
-                       fifo-size = <1>;
-                       no-loopback-test;
-
-                       status = "disabled";
-               };
-
-               uart1: serial@2100 {
-                       compatible = "ns16550a";
-                       reg = <0x2100 0x100>;
-
-                       clock-frequency = <200000000>;
-
-                       interrupt-parent = <&cpuintc>;
-                       interrupts = <30>;
-
-                       reg-io-width = <1>;
-                       reg-shift = <2>;
-                       fifo-size = <1>;
-                       no-loopback-test;
-
-                       status = "disabled";
-               };
-       };
-};