Skip to content

Commit 3b0f24d

Browse files
svanheuletsbogend
authored andcommitted
mips: dts: realtek: Decouple RTL930x base DTSI
The RTL930x SoC series is sufficiently different to warrant its own base dtsi. This ensures no properties need to be deleted or overwritten, and prevents accidental inclusions of updates from rtl83xx.dtsi. Signed-off-by: Sander Vanheule <[email protected]> Reviewed-by: Chris Packham <[email protected]> Tested-by: Chris Packham <[email protected]> # For RTL9302C Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 25613b4 commit 3b0f24d

File tree

1 file changed

+83
-50
lines changed

1 file changed

+83
-50
lines changed
Lines changed: 83 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause
22

3-
#include "rtl83xx.dtsi"
4-
53
/ {
64
compatible = "realtek,rtl9302-soc";
75

6+
#address-cells = <1>;
7+
#size-cells = <1>;
8+
9+
aliases {
10+
serial0 = &uart0;
11+
serial1 = &uart1;
12+
};
13+
14+
cpuintc: cpuintc {
15+
compatible = "mti,cpu-interrupt-controller";
16+
#address-cells = <0>;
17+
#interrupt-cells = <1>;
18+
interrupt-controller;
19+
};
20+
821
cpus {
922
#address-cells = <1>;
1023
#size-cells = <0>;
@@ -58,64 +71,84 @@
5871
status = "disabled";
5972
};
6073
};
61-
};
6274

63-
&soc {
64-
ranges = <0x0 0x18000000 0x20000>;
75+
soc: soc@18000000 {
76+
compatible = "simple-bus";
77+
#address-cells = <1>;
78+
#size-cells = <1>;
79+
ranges = <0x0 0x18000000 0x20000>;
6580

66-
intc: interrupt-controller@3000 {
67-
compatible = "realtek,rtl9300-intc", "realtek,rtl-intc";
68-
reg = <0x3000 0x18>, <0x3018 0x18>;
69-
interrupt-controller;
70-
#interrupt-cells = <1>;
81+
intc: interrupt-controller@3000 {
82+
compatible = "realtek,rtl9300-intc", "realtek,rtl-intc";
83+
reg = <0x3000 0x18>, <0x3018 0x18>;
84+
interrupt-controller;
85+
#interrupt-cells = <1>;
7186

72-
interrupt-parent = <&cpuintc>;
73-
interrupts = <2>, <3>, <4>, <5>, <6>, <7>;
74-
};
87+
interrupt-parent = <&cpuintc>;
88+
interrupts = <2>, <3>, <4>, <5>, <6>, <7>;
89+
};
7590

76-
spi0: spi@1200 {
77-
compatible = "realtek,rtl8380-spi";
78-
reg = <0x1200 0x100>;
91+
spi0: spi@1200 {
92+
compatible = "realtek,rtl8380-spi";
93+
reg = <0x1200 0x100>;
7994

80-
#address-cells = <1>;
81-
#size-cells = <0>;
82-
};
95+
#address-cells = <1>;
96+
#size-cells = <0>;
97+
};
8398

84-
timer0: timer@3200 {
85-
compatible = "realtek,rtl9302-timer", "realtek,otto-timer";
86-
reg = <0x3200 0x10>, <0x3210 0x10>, <0x3220 0x10>,
87-
<0x3230 0x10>, <0x3240 0x10>;
99+
timer0: timer@3200 {
100+
compatible = "realtek,rtl9302-timer", "realtek,otto-timer";
101+
reg = <0x3200 0x10>, <0x3210 0x10>, <0x3220 0x10>,
102+
<0x3230 0x10>, <0x3240 0x10>;
88103

89-
interrupt-parent = <&intc>;
90-
interrupts = <7>, <8>, <9>, <10>, <11>;
91-
clocks = <&lx_clk>;
92-
};
104+
interrupt-parent = <&intc>;
105+
interrupts = <7>, <8>, <9>, <10>, <11>;
106+
clocks = <&lx_clk>;
107+
};
93108

94-
snand: spi@1a400 {
95-
compatible = "realtek,rtl9301-snand";
96-
reg = <0x1a400 0x44>;
97-
interrupt-parent = <&intc>;
98-
interrupts = <19>;
99-
clocks = <&lx_clk>;
100-
#address-cells = <1>;
101-
#size-cells = <0>;
102-
status = "disabled";
103-
};
104-
};
109+
snand: spi@1a400 {
110+
compatible = "realtek,rtl9301-snand";
111+
reg = <0x1a400 0x44>;
112+
interrupt-parent = <&intc>;
113+
interrupts = <19>;
114+
clocks = <&lx_clk>;
115+
#address-cells = <1>;
116+
#size-cells = <0>;
117+
status = "disabled";
118+
};
105119

106-
&uart0 {
107-
/delete-property/ clock-frequency;
108-
clocks = <&lx_clk>;
120+
uart0: serial@2000 {
121+
compatible = "ns16550a";
122+
reg = <0x2000 0x100>;
109123

110-
interrupt-parent = <&intc>;
111-
interrupts = <30>;
112-
};
124+
clocks = <&lx_clk>;
113125

114-
&uart1 {
115-
/delete-property/ clock-frequency;
116-
clocks = <&lx_clk>;
126+
interrupt-parent = <&intc>;
127+
interrupts = <30>;
117128

118-
interrupt-parent = <&intc>;
119-
interrupts = <31>;
120-
};
129+
reg-io-width = <1>;
130+
reg-shift = <2>;
131+
fifo-size = <1>;
132+
no-loopback-test;
121133

134+
status = "disabled";
135+
};
136+
137+
uart1: serial@2100 {
138+
compatible = "ns16550a";
139+
reg = <0x2100 0x100>;
140+
141+
clocks = <&lx_clk>;
142+
143+
interrupt-parent = <&intc>;
144+
interrupts = <31>;
145+
146+
reg-io-width = <1>;
147+
reg-shift = <2>;
148+
fifo-size = <1>;
149+
no-loopback-test;
150+
151+
status = "disabled";
152+
};
153+
};
154+
};

0 commit comments

Comments
 (0)