Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

realtek: cleanup and update soc dtsi in 5.10

Browse source 
the following changes are included in this patch:

- node is enabled by default, drop 'status = "okay"'
- adjust order of "compatible" lines and "reg" lines
- add a new blank line before fixed-link node in rtl830x.dtsi

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
This commit is contained in:
INAGAKI Hiroshi 2021-08-11 20:27:38 +09:00 committed by Adrian Schmutzler
parent 0de230bd0c
commit 1c020f8b43
2 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
target/linux/realtek/dts-5.10/rtl838x.dtsi
View file

@ -69,23 +69,21 @@
}; };
cpuintc: cpuintc { cpuintc: cpuintc {
compatible = "mti,cpu-interrupt-controller";
#address-cells = <0>; #address-cells = <0>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
compatible = "mti,cpu-interrupt-controller";
}; };
intc: rtlintc { intc: rtlintc {
compatible = "realtek,rt8380-intc";
reg = <0xb8003000 0x20>;
#address-cells = <0>; #address-cells = <0>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
compatible = "realtek,rt8380-intc";
reg = <0xb8003000 0x20>;
}; };
spi0: spi@b8001200 { spi0: spi@b8001200 {
status = "okay";
compatible = "realtek,rtl838x-nor"; compatible = "realtek,rtl838x-nor";
reg = <0xb8001200 0x100>; reg = <0xb8001200 0x100>;
@ -94,8 +92,6 @@
}; };
uart0: uart@b8002000 { uart0: uart@b8002000 {
status = "okay";
compatible = "ns16550a"; compatible = "ns16550a";
reg = <0xb8002000 0x100>; reg = <0xb8002000 0x100>;
@ -114,8 +110,6 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&enable_uart1>; pinctrl-0 = <&enable_uart1>;
status = "okay";
compatible = "ns16550a"; compatible = "ns16550a";
reg = <0xb8002100 0x100>; reg = <0xb8002100 0x100>;
@ -140,11 +134,12 @@
}; };
gpio1: rtl8231-gpio { gpio1: rtl8231-gpio {
status = "disabled";
compatible = "realtek,rtl8231-gpio"; compatible = "realtek,rtl8231-gpio";
#gpio-cells = <2>; #gpio-cells = <2>;
indirect-access-bus-id = <0>; indirect-access-bus-id = <0>;
gpio-controller; gpio-controller;
status = "disabled";
}; };
pinmux: pinmux@bb001000 { pinmux: pinmux@bb001000 {
@ -162,8 +157,6 @@
}; };
ethernet0: ethernet@bb00a300 { ethernet0: ethernet@bb00a300 {
status = "okay";
compatible = "realtek,rtl838x-eth"; compatible = "realtek,rtl838x-eth";
reg = <0xbb00a300 0x100>; reg = <0xbb00a300 0x100>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
@ -178,11 +171,9 @@
}; };
switch0: switch@bb000000 { switch0: switch@bb000000 {
status = "okay"; compatible = "realtek,rtl83xx-switch";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
interrupts = <20>; interrupts = <20>;
compatible = "realtek,rtl83xx-switch";
}; };
}; };

18
target/linux/realtek/dts-5.10/rtl930x.dtsi
View file

@ -74,18 +74,18 @@
}; };
cpuintc: cpuintc { cpuintc: cpuintc {
compatible = "mti,cpu-interrupt-controller";
#address-cells = <0>; #address-cells = <0>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
compatible = "mti,cpu-interrupt-controller";
}; };
intc: rtlintc { intc: rtlintc {
compatible = "realtek,rt9300-intc";
reg = <0xb8003000 0x20>;
#address-cells = <0>; #address-cells = <0>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
compatible = "realtek,rt9300-intc";
reg = <0xb8003000 0x20>;
}; };
osc: oscillator { osc: oscillator {
@ -105,8 +105,6 @@
}; };
spi0: spi@b8001200 { spi0: spi@b8001200 {
status = "okay";
compatible = "realtek,rtl838x-nor"; compatible = "realtek,rtl838x-nor";
reg = <0xb8001200 0x100>; reg = <0xb8001200 0x100>;
@ -127,8 +125,6 @@
reg-shift = <2>; reg-shift = <2>;
fifo-size = <1>; fifo-size = <1>;
no-loopback-test; no-loopback-test;
status = "okay";
}; };
uart1: uart@b8002100 { uart1: uart@b8002100 {
@ -144,8 +140,6 @@
reg-shift = <2>; reg-shift = <2>;
fifo-size = <1>; fifo-size = <1>;
no-loopback-test; no-loopback-test;
status = "okay";
}; };
gpio0: gpio-controller@b8003500 { gpio0: gpio-controller@b8003500 {
@ -158,13 +152,13 @@
}; };
ethernet0: ethernet@bb00a300 { ethernet0: ethernet@bb00a300 {
status = "okay";
compatible = "realtek,rtl838x-eth"; compatible = "realtek,rtl838x-eth";
reg = <0xbb00a300 0x100>; reg = <0xbb00a300 0x100>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
interrupts = <24>; interrupts = <24>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
phy-mode = "internal"; phy-mode = "internal";
fixed-link { fixed-link {
speed = <1000>; speed = <1000>;
full-duplex; full-duplex;
@ -172,11 +166,9 @@
}; };
switch0: switch@bb000000 { switch0: switch@bb000000 {
status = "okay"; compatible = "realtek,rtl83xx-switch";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
interrupts = <20>; interrupts = <20>;
compatible = "realtek,rtl83xx-switch";
}; };
}; };