Skip to content

Commit 4dd01a3

Browse files
arinc9ffainelli
authored andcommitted
ARM: dts: BCM5301X: Conform to DTS Coding Style on ASUS RT-AC3100 & AC88U
Reorder the nodes and properties to conform to the Devicetree Sources (DTS) Coding Style. Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20240423-for-soc-asus-rt-ac3200-ac5300-v3-5-23d33cfafe7a@arinc9.com Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
1 parent 961dedc commit 4dd01a3

2 files changed

Lines changed: 80 additions & 81 deletions

File tree

arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac3100.dtsi

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,44 @@
1010

1111
/ {
1212
memory@0 {
13-
device_type = "memory";
1413
reg = <0x00000000 0x08000000>,
1514
<0x88000000 0x18000000>;
15+
device_type = "memory";
1616
};
1717

1818
nvram@1c080000 {
1919
compatible = "brcm,nvram";
2020
reg = <0x1c080000 0x00180000>;
2121
};
2222

23+
gpio-keys {
24+
compatible = "gpio-keys";
25+
26+
button-led {
27+
label = "Backlight";
28+
linux,code = <KEY_BRIGHTNESS_ZERO>;
29+
gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
30+
};
31+
32+
button-reset {
33+
label = "Reset";
34+
linux,code = <KEY_RESTART>;
35+
gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
36+
};
37+
38+
button-wifi {
39+
label = "Wi-Fi";
40+
linux,code = <KEY_RFKILL>;
41+
gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
42+
};
43+
44+
button-wps {
45+
label = "WPS";
46+
linux,code = <KEY_WPS_BUTTON>;
47+
gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
48+
};
49+
};
50+
2351
leds {
2452
compatible = "gpio-leds";
2553

@@ -66,32 +94,29 @@
6694
gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
6795
};
6896
};
97+
};
6998

70-
gpio-keys {
71-
compatible = "gpio-keys";
72-
73-
button-led {
74-
label = "Backlight";
75-
linux,code = <KEY_BRIGHTNESS_ZERO>;
76-
gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
77-
};
99+
&nandcs {
100+
partitions {
101+
compatible = "fixed-partitions";
102+
#address-cells = <1>;
103+
#size-cells = <1>;
78104

79-
button-reset {
80-
label = "Reset";
81-
linux,code = <KEY_RESTART>;
82-
gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
105+
partition@0 {
106+
reg = <0x00000000 0x00080000>;
107+
label = "boot";
108+
read-only;
83109
};
84110

85-
button-wifi {
86-
label = "Wi-Fi";
87-
linux,code = <KEY_RFKILL>;
88-
gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
111+
partition@80000 {
112+
reg = <0x00080000 0x00180000>;
113+
label = "nvram";
89114
};
90115

91-
button-wps {
92-
label = "WPS";
93-
linux,code = <KEY_WPS_BUTTON>;
94-
gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
116+
partition@200000 {
117+
compatible = "brcm,trx";
118+
reg = <0x00200000 0x07e00000>;
119+
label = "firmware";
95120
};
96121
};
97122
};
@@ -141,28 +166,3 @@
141166
&usb3_phy {
142167
status = "okay";
143168
};
144-
145-
&nandcs {
146-
partitions {
147-
compatible = "fixed-partitions";
148-
#address-cells = <1>;
149-
#size-cells = <1>;
150-
151-
partition@0 {
152-
label = "boot";
153-
reg = <0x00000000 0x00080000>;
154-
read-only;
155-
};
156-
157-
partition@80000 {
158-
label = "nvram";
159-
reg = <0x00080000 0x00180000>;
160-
};
161-
162-
partition@200000 {
163-
label = "firmware";
164-
reg = <0x00200000 0x07e00000>;
165-
compatible = "brcm,trx";
166-
};
167-
};
168-
};

arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac88u.dts

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,34 @@
1919

2020
switch {
2121
compatible = "realtek,rtl8365mb";
22-
/* 7 = MDIO (has input reads), 6 = MDC (clock, output only) */
2322
mdc-gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
2423
mdio-gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
2524
reset-gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
2625
realtek,disable-leds;
2726
dsa,member = <1 0>;
2827

28+
mdio {
29+
compatible = "realtek,smi-mdio";
30+
#address-cells = <1>;
31+
#size-cells = <0>;
32+
33+
ethphy0: ethernet-phy@0 {
34+
reg = <0>;
35+
};
36+
37+
ethphy1: ethernet-phy@1 {
38+
reg = <1>;
39+
};
40+
41+
ethphy2: ethernet-phy@2 {
42+
reg = <2>;
43+
};
44+
45+
ethphy3: ethernet-phy@3 {
46+
reg = <3>;
47+
};
48+
};
49+
2950
ports {
3051
#address-cells = <1>;
3152
#size-cells = <0>;
@@ -69,29 +90,21 @@
6990
};
7091
};
7192
};
93+
};
94+
};
7295

73-
mdio {
74-
compatible = "realtek,smi-mdio";
75-
#address-cells = <1>;
76-
#size-cells = <0>;
77-
78-
ethphy0: ethernet-phy@0 {
79-
reg = <0>;
80-
};
81-
82-
ethphy1: ethernet-phy@1 {
83-
reg = <1>;
84-
};
96+
&gmac0 {
97+
status = "disabled";
98+
};
8599

86-
ethphy2: ethernet-phy@2 {
87-
reg = <2>;
88-
};
100+
&gmac1 {
101+
nvmem-cells = <&et1macaddr 0>;
102+
nvmem-cell-names = "mac-address";
103+
};
89104

90-
ethphy3: ethernet-phy@3 {
91-
reg = <3>;
92-
};
93-
};
94-
};
105+
&gmac2 {
106+
nvmem-cells = <&et1macaddr 1>;
107+
nvmem-cell-names = "mac-address";
95108
};
96109

97110
&srab {
@@ -112,17 +125,3 @@
112125
};
113126
};
114127
};
115-
116-
&gmac0 {
117-
status = "disabled";
118-
};
119-
120-
&gmac1 {
121-
nvmem-cells = <&et1macaddr 0>;
122-
nvmem-cell-names = "mac-address";
123-
};
124-
125-
&gmac2 {
126-
nvmem-cells = <&et1macaddr 1>;
127-
nvmem-cell-names = "mac-address";
128-
};

0 commit comments

Comments
 (0)