Skip to content

Commit fedb923

Browse files
Linus Walleijgclement
authored andcommitted
ARM64: dts: marvell: Fix some common switch mistakes
Fix some errors in the Marvell MV88E6xxx switch descriptions: - The top node had no address size or cells. - switch0@0 is not OK, should be ethernet-switch@0. - ports should be ethernet-ports - port@0 should be ethernet-port@0 - PHYs should be named ethernet-phy@ Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
1 parent b85ea95 commit fedb923

7 files changed

Lines changed: 115 additions & 112 deletions

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,32 +126,32 @@
126126

127127
reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>;
128128

129-
ports {
130-
switch0port1: port@1 {
129+
ethernet-ports {
130+
switch0port1: ethernet-port@1 {
131131
reg = <1>;
132132
label = "lan0";
133133
phy-handle = <&switch0phy0>;
134134
};
135135

136-
switch0port2: port@2 {
136+
switch0port2: ethernet-port@2 {
137137
reg = <2>;
138138
label = "lan1";
139139
phy-handle = <&switch0phy1>;
140140
};
141141

142-
switch0port3: port@3 {
142+
switch0port3: ethernet-port@3 {
143143
reg = <3>;
144144
label = "lan2";
145145
phy-handle = <&switch0phy2>;
146146
};
147147

148-
switch0port4: port@4 {
148+
switch0port4: ethernet-port@4 {
149149
reg = <4>;
150150
label = "lan3";
151151
phy-handle = <&switch0phy3>;
152152
};
153153

154-
switch0port5: port@5 {
154+
switch0port5: ethernet-port@5 {
155155
reg = <5>;
156156
label = "wan";
157157
phy-handle = <&extphy>;
@@ -160,7 +160,7 @@
160160
};
161161

162162
mdio {
163-
switch0phy3: switch0phy3@14 {
163+
switch0phy3: ethernet-phy@14 {
164164
reg = <0x14>;
165165
};
166166
};

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,17 @@
145145
};
146146

147147
&mdio {
148-
switch0: switch0@1 {
148+
switch0: ethernet-switch@1 {
149149
compatible = "marvell,mv88e6085";
150-
#address-cells = <1>;
151-
#size-cells = <0>;
152150
reg = <1>;
153151

154152
dsa,member = <0 0>;
155153

156-
ports {
154+
ethernet-ports {
157155
#address-cells = <1>;
158156
#size-cells = <0>;
159157

160-
switch0port0: port@0 {
158+
switch0port0: ethernet-port@0 {
161159
reg = <0>;
162160
label = "cpu";
163161
ethernet = <&eth0>;
@@ -168,19 +166,19 @@
168166
};
169167
};
170168

171-
switch0port1: port@1 {
169+
switch0port1: ethernet-port@1 {
172170
reg = <1>;
173171
label = "wan";
174172
phy-handle = <&switch0phy0>;
175173
};
176174

177-
switch0port2: port@2 {
175+
switch0port2: ethernet-port@2 {
178176
reg = <2>;
179177
label = "lan0";
180178
phy-handle = <&switch0phy1>;
181179
};
182180

183-
switch0port3: port@3 {
181+
switch0port3: ethernet-port@3 {
184182
reg = <3>;
185183
label = "lan1";
186184
phy-handle = <&switch0phy2>;
@@ -192,13 +190,13 @@
192190
#address-cells = <1>;
193191
#size-cells = <0>;
194192

195-
switch0phy0: switch0phy0@11 {
193+
switch0phy0: ethernet-phy@11 {
196194
reg = <0x11>;
197195
};
198-
switch0phy1: switch0phy1@12 {
196+
switch0phy1: ethernet-phy@12 {
199197
reg = <0x12>;
200198
};
201-
switch0phy2: switch0phy2@13 {
199+
switch0phy2: ethernet-phy@13 {
202200
reg = <0x13>;
203201
};
204202
};

arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -152,31 +152,29 @@
152152
};
153153

154154
&mdio {
155-
switch0: switch0@1 {
155+
switch0: ethernet-switch@1 {
156156
compatible = "marvell,mv88e6085";
157-
#address-cells = <1>;
158-
#size-cells = <0>;
159157
reg = <1>;
160158

161159
dsa,member = <0 0>;
162160

163-
ports: ports {
161+
ports: ethernet-ports {
164162
#address-cells = <1>;
165163
#size-cells = <0>;
166164

167-
port@0 {
165+
ethernet-port@0 {
168166
reg = <0>;
169167
label = "cpu";
170168
ethernet = <&eth0>;
171169
};
172170

173-
port@1 {
171+
ethernet-port@1 {
174172
reg = <1>;
175173
label = "wan";
176174
phy-handle = <&switch0phy0>;
177175
};
178176

179-
port@2 {
177+
ethernet-port@2 {
180178
reg = <2>;
181179
label = "lan0";
182180
phy-handle = <&switch0phy1>;
@@ -185,7 +183,7 @@
185183
nvmem-cell-names = "mac-address";
186184
};
187185

188-
port@3 {
186+
ethernet-port@3 {
189187
reg = <3>;
190188
label = "lan1";
191189
phy-handle = <&switch0phy2>;
@@ -199,13 +197,13 @@
199197
#address-cells = <1>;
200198
#size-cells = <0>;
201199

202-
switch0phy0: switch0phy0@11 {
200+
switch0phy0: ethernet-phy@11 {
203201
reg = <0x11>;
204202
};
205-
switch0phy1: switch0phy1@12 {
203+
switch0phy1: ethernet-phy@12 {
206204
reg = <0x12>;
207205
};
208-
switch0phy2: switch0phy2@13 {
206+
switch0phy2: ethernet-phy@13 {
209207
reg = <0x13>;
210208
};
211209
};

0 commit comments

Comments
 (0)