Skip to content

Commit f07c965

Browse files
arndbarndb
committed
MT7530 (e.g. BPI R2): - several DT clean-ups - add port5 as CPU port * tag 'v6.4-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: arm: dts: mt7623: add port@5 as CPU port arm: dts: mt7623: enable flow control on port@6 arm: dts: mt7623: change mt7530 switch address arm: dts: mt7623: add mt7530 switch to mt7623a.dtsi arm: dts: mt7623: add gmacs to mt7623.dtsi Link: https://lore.kernel.org/r/98e21acb-d792-6a8c-2de6-12d5af8a8111@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 055fdca + 115ee47 commit f07c965

6 files changed

Lines changed: 207 additions & 162 deletions

File tree

‎arch/arm/boot/dts/mt7623.dtsi‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,18 @@
980980
#address-cells = <1>;
981981
#size-cells = <0>;
982982
status = "disabled";
983+
984+
gmac0: mac@0 {
985+
compatible = "mediatek,eth-mac";
986+
reg = <0>;
987+
status = "disabled";
988+
};
989+
990+
gmac1: mac@1 {
991+
compatible = "mediatek,eth-mac";
992+
reg = <1>;
993+
status = "disabled";
994+
};
983995
};
984996

985997
crypto: crypto@1b240000 {

‎arch/arm/boot/dts/mt7623a-rfb-emmc.dts‎

Lines changed: 21 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -112,75 +112,31 @@
112112
status = "okay";
113113
};
114114

115-
&eth {
116-
status = "okay";
115+
&switch0 {
116+
ports {
117+
port@0 {
118+
status = "okay";
119+
label = "lan0";
120+
};
121+
122+
port@1 {
123+
status = "okay";
124+
label = "lan1";
125+
};
117126

118-
gmac0: mac@0 {
119-
compatible = "mediatek,eth-mac";
120-
reg = <0>;
121-
phy-mode = "trgmii";
127+
port@2 {
128+
status = "okay";
129+
label = "lan2";
130+
};
122131

123-
fixed-link {
124-
speed = <1000>;
125-
full-duplex;
126-
pause;
132+
port@3 {
133+
status = "okay";
134+
label = "lan3";
127135
};
128-
};
129136

130-
mdio-bus {
131-
#address-cells = <1>;
132-
#size-cells = <0>;
133-
134-
switch@0 {
135-
compatible = "mediatek,mt7530";
136-
reg = <0>;
137-
mediatek,mcm;
138-
resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
139-
reset-names = "mcm";
140-
core-supply = <&mt6323_vpa_reg>;
141-
io-supply = <&mt6323_vemc3v3_reg>;
142-
143-
ports {
144-
#address-cells = <1>;
145-
#size-cells = <0>;
146-
147-
port@0 {
148-
reg = <0>;
149-
label = "lan0";
150-
};
151-
152-
port@1 {
153-
reg = <1>;
154-
label = "lan1";
155-
};
156-
157-
port@2 {
158-
reg = <2>;
159-
label = "lan2";
160-
};
161-
162-
port@3 {
163-
reg = <3>;
164-
label = "lan3";
165-
};
166-
167-
port@4 {
168-
reg = <4>;
169-
label = "wan";
170-
};
171-
172-
port@6 {
173-
reg = <6>;
174-
label = "cpu";
175-
ethernet = <&gmac0>;
176-
phy-mode = "trgmii";
177-
178-
fixed-link {
179-
speed = <1000>;
180-
full-duplex;
181-
};
182-
};
183-
};
137+
port@4 {
138+
status = "okay";
139+
label = "wan";
184140
};
185141
};
186142
};

‎arch/arm/boot/dts/mt7623a-rfb-nand.dts‎

Lines changed: 21 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -116,75 +116,31 @@
116116
status = "okay";
117117
};
118118

119-
&eth {
120-
status = "okay";
119+
&switch0 {
120+
ports {
121+
port@0 {
122+
status = "okay";
123+
label = "lan0";
124+
};
121125

122-
gmac0: mac@0 {
123-
compatible = "mediatek,eth-mac";
124-
reg = <0>;
125-
phy-mode = "trgmii";
126+
port@1 {
127+
status = "okay";
128+
label = "lan1";
129+
};
126130

127-
fixed-link {
128-
speed = <1000>;
129-
full-duplex;
130-
pause;
131+
port@2 {
132+
status = "okay";
133+
label = "lan2";
131134
};
132-
};
133135

134-
mdio-bus {
135-
#address-cells = <1>;
136-
#size-cells = <0>;
137-
138-
switch@0 {
139-
compatible = "mediatek,mt7530";
140-
reg = <0>;
141-
mediatek,mcm;
142-
resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
143-
reset-names = "mcm";
144-
core-supply = <&mt6323_vpa_reg>;
145-
io-supply = <&mt6323_vemc3v3_reg>;
146-
147-
ports {
148-
#address-cells = <1>;
149-
#size-cells = <0>;
150-
151-
port@0 {
152-
reg = <0>;
153-
label = "lan0";
154-
};
155-
156-
port@1 {
157-
reg = <1>;
158-
label = "lan1";
159-
};
160-
161-
port@2 {
162-
reg = <2>;
163-
label = "lan2";
164-
};
165-
166-
port@3 {
167-
reg = <3>;
168-
label = "lan3";
169-
};
170-
171-
port@4 {
172-
reg = <4>;
173-
label = "wan";
174-
};
175-
176-
port@6 {
177-
reg = <6>;
178-
label = "cpu";
179-
ethernet = <&gmac0>;
180-
phy-mode = "trgmii";
181-
182-
fixed-link {
183-
speed = <1000>;
184-
full-duplex;
185-
};
186-
};
187-
};
136+
port@3 {
137+
status = "okay";
138+
label = "lan3";
139+
};
140+
141+
port@4 {
142+
status = "okay";
143+
label = "wan";
188144
};
189145
};
190146
};

‎arch/arm/boot/dts/mt7623a.dtsi‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,107 @@
1717
power-domains = <&scpsys MT7623A_POWER_DOMAIN_ETH>;
1818
};
1919

20+
&gmac0 {
21+
status = "okay";
22+
phy-mode = "trgmii";
23+
24+
fixed-link {
25+
speed = <1000>;
26+
full-duplex;
27+
pause;
28+
};
29+
};
30+
31+
&gmac1 {
32+
status = "okay";
33+
phy-mode = "rgmii";
34+
35+
fixed-link {
36+
speed = <1000>;
37+
full-duplex;
38+
pause;
39+
};
40+
};
41+
2042
&eth {
43+
status = "okay";
2144
power-domains = <&scpsys MT7623A_POWER_DOMAIN_ETH>;
45+
46+
mdio: mdio-bus {
47+
#address-cells = <1>;
48+
#size-cells = <0>;
49+
50+
switch0: switch@1f {
51+
compatible = "mediatek,mt7530";
52+
reg = <0x1f>;
53+
mediatek,mcm;
54+
resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
55+
reset-names = "mcm";
56+
core-supply = <&mt6323_vpa_reg>;
57+
io-supply = <&mt6323_vemc3v3_reg>;
58+
59+
ports {
60+
#address-cells = <1>;
61+
#size-cells = <0>;
62+
63+
port@0 {
64+
status = "disabled";
65+
reg = <0>;
66+
label = "swp0";
67+
};
68+
69+
port@1 {
70+
status = "disabled";
71+
reg = <1>;
72+
label = "swp1";
73+
};
74+
75+
port@2 {
76+
status = "disabled";
77+
reg = <2>;
78+
label = "swp2";
79+
};
80+
81+
port@3 {
82+
status = "disabled";
83+
reg = <3>;
84+
label = "swp3";
85+
};
86+
87+
port@4 {
88+
status = "disabled";
89+
reg = <4>;
90+
label = "swp4";
91+
};
92+
93+
port@5 {
94+
reg = <5>;
95+
label = "cpu";
96+
ethernet = <&gmac1>;
97+
phy-mode = "rgmii";
98+
99+
fixed-link {
100+
speed = <1000>;
101+
full-duplex;
102+
pause;
103+
};
104+
};
105+
106+
port@6 {
107+
reg = <6>;
108+
label = "cpu";
109+
ethernet = <&gmac0>;
110+
phy-mode = "trgmii";
111+
112+
fixed-link {
113+
speed = <1000>;
114+
full-duplex;
115+
pause;
116+
};
117+
};
118+
};
119+
};
120+
};
22121
};
23122

24123
&nandc {

‎arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,28 +171,38 @@
171171
};
172172
};
173173

174-
&eth {
174+
&gmac0 {
175175
status = "okay";
176+
phy-mode = "trgmii";
176177

177-
gmac0: mac@0 {
178-
compatible = "mediatek,eth-mac";
179-
reg = <0>;
180-
phy-mode = "trgmii";
178+
fixed-link {
179+
speed = <1000>;
180+
full-duplex;
181+
pause;
182+
};
183+
};
181184

182-
fixed-link {
183-
speed = <1000>;
184-
full-duplex;
185-
pause;
186-
};
185+
&gmac1 {
186+
status = "okay";
187+
phy-mode = "rgmii";
188+
189+
fixed-link {
190+
speed = <1000>;
191+
full-duplex;
192+
pause;
187193
};
194+
};
195+
196+
&eth {
197+
status = "okay";
188198

189-
mdio: mdio-bus {
199+
mdio-bus {
190200
#address-cells = <1>;
191201
#size-cells = <0>;
192202

193-
switch@0 {
203+
switch@1f {
194204
compatible = "mediatek,mt7530";
195-
reg = <0>;
205+
reg = <0x1f>;
196206
reset-gpios = <&pio 33 0>;
197207
core-supply = <&mt6323_vpa_reg>;
198208
io-supply = <&mt6323_vemc3v3_reg>;
@@ -226,6 +236,19 @@
226236
label = "lan3";
227237
};
228238

239+
port@5 {
240+
reg = <5>;
241+
label = "cpu";
242+
ethernet = <&gmac1>;
243+
phy-mode = "rgmii";
244+
245+
fixed-link {
246+
speed = <1000>;
247+
full-duplex;
248+
pause;
249+
};
250+
};
251+
229252
port@6 {
230253
reg = <6>;
231254
label = "cpu";

0 commit comments

Comments
 (0)