Skip to content

Commit 045cbcc

Browse files
svanheuletsbogend
authored andcommitted
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 <[email protected]> Reviewed-by: Chris Packham <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 652d500 commit 045cbcc

File tree

3 files changed

+56
-60
lines changed

3 files changed

+56
-60
lines changed

arch/mips/boot/dts/realtek/cisco_sg220-26.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
/dts-v1/;
44

5-
#include "rtl83xx.dtsi"
65
#include "rtl838x.dtsi"
76

87
/ {

arch/mips/boot/dts/realtek/rtl838x.dtsi

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause
22

33
/ {
4+
#address-cells = <1>;
5+
#size-cells = <1>;
6+
7+
aliases {
8+
serial0 = &uart0;
9+
serial1 = &uart1;
10+
};
11+
412
cpus {
513
#address-cells = <1>;
614
#size-cells = <0>;
@@ -18,4 +26,52 @@
1826
#clock-cells = <0>;
1927
clock-frequency = <500000000>;
2028
};
29+
30+
cpuintc: cpuintc {
31+
compatible = "mti,cpu-interrupt-controller";
32+
#address-cells = <0>;
33+
#interrupt-cells = <1>;
34+
interrupt-controller;
35+
};
36+
37+
soc@18000000 {
38+
compatible = "simple-bus";
39+
#address-cells = <1>;
40+
#size-cells = <1>;
41+
ranges = <0x0 0x18000000 0x10000>;
42+
43+
uart0: serial@2000 {
44+
compatible = "ns16550a";
45+
reg = <0x2000 0x100>;
46+
47+
clock-frequency = <200000000>;
48+
49+
interrupt-parent = <&cpuintc>;
50+
interrupts = <31>;
51+
52+
reg-io-width = <1>;
53+
reg-shift = <2>;
54+
fifo-size = <1>;
55+
no-loopback-test;
56+
57+
status = "disabled";
58+
};
59+
60+
uart1: serial@2100 {
61+
compatible = "ns16550a";
62+
reg = <0x2100 0x100>;
63+
64+
clock-frequency = <200000000>;
65+
66+
interrupt-parent = <&cpuintc>;
67+
interrupts = <30>;
68+
69+
reg-io-width = <1>;
70+
reg-shift = <2>;
71+
fifo-size = <1>;
72+
no-loopback-test;
73+
74+
status = "disabled";
75+
};
76+
};
2177
};

arch/mips/boot/dts/realtek/rtl83xx.dtsi

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)