aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/realtek
diff options
context:
space:
mode:
authorINAGAKI Hiroshi <musashino.open@gmail.com>2021-08-11 20:27:38 +0900
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-09-26 00:32:17 +0200
commit1c020f8b439bf6439cb878e2888ed3dd1562b92e (patch)
tree77afdd6c1163fcd016c83b963756255fd859ad0e /target/linux/realtek
parent0de230bd0ce1c011a6d57ce7692b1b7898e7b735 (diff)
downloadupstream-1c020f8b439bf6439cb878e2888ed3dd1562b92e.tar.gz
upstream-1c020f8b439bf6439cb878e2888ed3dd1562b92e.tar.bz2
upstream-1c020f8b439bf6439cb878e2888ed3dd1562b92e.zip
realtek: cleanup and update soc dtsi in 5.10
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>
Diffstat (limited to 'target/linux/realtek')
-rw-r--r--target/linux/realtek/dts-5.10/rtl838x.dtsi21
-rw-r--r--target/linux/realtek/dts-5.10/rtl930x.dtsi18
2 files changed, 11 insertions, 28 deletions
diff --git a/target/linux/realtek/dts-5.10/rtl838x.dtsi b/target/linux/realtek/dts-5.10/rtl838x.dtsi
index b59b141f66..315d34ac0c 100644
--- a/target/linux/realtek/dts-5.10/rtl838x.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl838x.dtsi
@@ -69,23 +69,21 @@
};
cpuintc: cpuintc {
+ compatible = "mti,cpu-interrupt-controller";
#address-cells = <0>;
#interrupt-cells = <1>;
interrupt-controller;
- compatible = "mti,cpu-interrupt-controller";
};
intc: rtlintc {
+ compatible = "realtek,rt8380-intc";
+ reg = <0xb8003000 0x20>;
#address-cells = <0>;
#interrupt-cells = <1>;
interrupt-controller;
- compatible = "realtek,rt8380-intc";
- reg = <0xb8003000 0x20>;
};
spi0: spi@b8001200 {
- status = "okay";
-
compatible = "realtek,rtl838x-nor";
reg = <0xb8001200 0x100>;
@@ -94,8 +92,6 @@
};
uart0: uart@b8002000 {
- status = "okay";
-
compatible = "ns16550a";
reg = <0xb8002000 0x100>;
@@ -114,8 +110,6 @@
pinctrl-names = "default";
pinctrl-0 = <&enable_uart1>;
- status = "okay";
-
compatible = "ns16550a";
reg = <0xb8002100 0x100>;
@@ -140,11 +134,12 @@
};
gpio1: rtl8231-gpio {
- status = "disabled";
compatible = "realtek,rtl8231-gpio";
#gpio-cells = <2>;
indirect-access-bus-id = <0>;
gpio-controller;
+
+ status = "disabled";
};
pinmux: pinmux@bb001000 {
@@ -162,8 +157,6 @@
};
ethernet0: ethernet@bb00a300 {
- status = "okay";
-
compatible = "realtek,rtl838x-eth";
reg = <0xbb00a300 0x100>;
interrupt-parent = <&intc>;
@@ -178,11 +171,9 @@
};
switch0: switch@bb000000 {
- status = "okay";
+ compatible = "realtek,rtl83xx-switch";
interrupt-parent = <&intc>;
interrupts = <20>;
-
- compatible = "realtek,rtl83xx-switch";
};
};
diff --git a/target/linux/realtek/dts-5.10/rtl930x.dtsi b/target/linux/realtek/dts-5.10/rtl930x.dtsi
index 5d13fc31b3..ea89fd2584 100644
--- a/target/linux/realtek/dts-5.10/rtl930x.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl930x.dtsi
@@ -74,18 +74,18 @@
};
cpuintc: cpuintc {
+ compatible = "mti,cpu-interrupt-controller";
#address-cells = <0>;
#interrupt-cells = <1>;
interrupt-controller;
- compatible = "mti,cpu-interrupt-controller";
};
intc: rtlintc {
+ compatible = "realtek,rt9300-intc";
+ reg = <0xb8003000 0x20>;
#address-cells = <0>;
#interrupt-cells = <1>;
interrupt-controller;
- compatible = "realtek,rt9300-intc";
- reg = <0xb8003000 0x20>;
};
osc: oscillator {
@@ -105,8 +105,6 @@
};
spi0: spi@b8001200 {
- status = "okay";
-
compatible = "realtek,rtl838x-nor";
reg = <0xb8001200 0x100>;
@@ -127,8 +125,6 @@
reg-shift = <2>;
fifo-size = <1>;
no-loopback-test;
-
- status = "okay";
};
uart1: uart@b8002100 {
@@ -144,8 +140,6 @@
reg-shift = <2>;
fifo-size = <1>;
no-loopback-test;
-
- status = "okay";
};
gpio0: gpio-controller@b8003500 {
@@ -158,13 +152,13 @@
};
ethernet0: ethernet@bb00a300 {
- status = "okay";
compatible = "realtek,rtl838x-eth";
reg = <0xbb00a300 0x100>;
interrupt-parent = <&intc>;
interrupts = <24>;
#interrupt-cells = <1>;
phy-mode = "internal";
+
fixed-link {
speed = <1000>;
full-duplex;
@@ -172,11 +166,9 @@
};
switch0: switch@bb000000 {
- status = "okay";
+ compatible = "realtek,rtl83xx-switch";
interrupt-parent = <&intc>;
interrupts = <20>;
-
- compatible = "realtek,rtl83xx-switch";
};
};