Skip to content

Commit d18dfbd

Browse files
achterinrobimarko
authored andcommitted
qualcommax: ipq807x: use ascii-env driver for Linksys MX4200v1
Just like it has already been changed for v2, use the ascii-eq-delim-env driver to extract the label mac from the devinfo partition. Signed-off-by: Christoph Krapp <[email protected]> Link: openwrt/openwrt#20732 Signed-off-by: Robert Marko <[email protected]> (cherry picked from commit f0c5348)
1 parent 6d7fbcc commit d18dfbd

File tree

3 files changed

+14
-31
lines changed

3 files changed

+14
-31
lines changed

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
#include "ipq8174-mx4x00.dtsi"
55

6+
/ {
7+
aliases {
8+
label-mac-device = &dp2;
9+
};
10+
};
11+
612
&tlmm {
713
iot_pins: iot-state {
814
recovery-pins {
@@ -238,23 +244,31 @@
238244
&dp2 {
239245
status = "okay";
240246
phy-handle = <&qca8075_1>;
247+
nvmem-cells = <&hw_mac_addr 0>;
248+
nvmem-cell-names = "mac-address";
241249
label = "wan";
242250
};
243251

244252
&dp3 {
245253
status = "okay";
246254
phy-handle = <&qca8075_2>;
255+
nvmem-cells = <&hw_mac_addr 0>;
256+
nvmem-cell-names = "mac-address";
247257
label = "lan1";
248258
};
249259

250260
&dp4 {
251261
status = "okay";
252262
phy-handle = <&qca8075_3>;
263+
nvmem-cells = <&hw_mac_addr 0>;
264+
nvmem-cell-names = "mac-address";
253265
label = "lan2";
254266
};
255267

256268
&dp5 {
257269
status = "okay";
258270
phy-handle = <&qca8075_4>;
271+
nvmem-cells = <&hw_mac_addr 0>;
272+
nvmem-cell-names = "mac-address";
259273
label = "lan3";
260274
};

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v1.dts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99
/ {
1010
model = "Linksys MX4200v1";
1111
compatible = "linksys,mx4200v1", "qcom,ipq8074";
12-
13-
aliases {
14-
ethernet1 = &dp2;
15-
ethernet2 = &dp3;
16-
ethernet3 = &dp4;
17-
ethernet4 = &dp5;
18-
};
1912
};
2013

2114
&wifi {

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v2.dts

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,6 @@
88
/ {
99
model = "Linksys MX4200v2";
1010
compatible = "linksys,mx4200v2", "qcom,ipq8074";
11-
12-
aliases {
13-
label-mac-device = &dp2;
14-
};
15-
};
16-
17-
&dp2 {
18-
nvmem-cells = <&hw_mac_addr 0>;
19-
nvmem-cell-names = "mac-address";
20-
};
21-
22-
&dp3 {
23-
nvmem-cells = <&hw_mac_addr 0>;
24-
nvmem-cell-names = "mac-address";
25-
};
26-
27-
&dp4 {
28-
nvmem-cells = <&hw_mac_addr 0>;
29-
nvmem-cell-names = "mac-address";
30-
};
31-
32-
&dp5 {
33-
nvmem-cells = <&hw_mac_addr 0>;
34-
nvmem-cell-names = "mac-address";
3511
};
3612

3713
&wifi {

0 commit comments

Comments
 (0)