Skip to content

Commit 916508c

Browse files
mwalleShawn Guo
authored andcommitted
Revert "arm64: dts: ls1028a: sl28: get MAC addresses from VPD"
With commit b203e6f ("arm64: dts: ls1028a: sl28: get MAC addresses from VPD"), the network adapter now depends on the nvmem device to be present, which isn't the case and thus breaks networking on this board. Revert it. Fixes: b203e6f ("arm64: dts: ls1028a: sl28: get MAC addresses from VPD") Signed-off-by: Michael Walle <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent fd4334a commit 916508c

File tree

5 files changed

+0
-41
lines changed

5 files changed

+0
-41
lines changed

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,10 @@
5656
};
5757

5858
&enetc_port2 {
59-
nvmem-cells = <&base_mac_address 2>;
60-
nvmem-cell-names = "mac-address";
6159
status = "okay";
6260
};
6361

6462
&enetc_port3 {
65-
nvmem-cells = <&base_mac_address 3>;
66-
nvmem-cell-names = "mac-address";
6763
status = "okay";
6864
};
6965

@@ -84,8 +80,6 @@
8480
managed = "in-band-status";
8581
phy-handle = <&qsgmii_phy0>;
8682
phy-mode = "qsgmii";
87-
nvmem-cells = <&base_mac_address 4>;
88-
nvmem-cell-names = "mac-address";
8983
status = "okay";
9084
};
9185

@@ -94,8 +88,6 @@
9488
managed = "in-band-status";
9589
phy-handle = <&qsgmii_phy1>;
9690
phy-mode = "qsgmii";
97-
nvmem-cells = <&base_mac_address 5>;
98-
nvmem-cell-names = "mac-address";
9991
status = "okay";
10092
};
10193

@@ -104,8 +96,6 @@
10496
managed = "in-band-status";
10597
phy-handle = <&qsgmii_phy2>;
10698
phy-mode = "qsgmii";
107-
nvmem-cells = <&base_mac_address 6>;
108-
nvmem-cell-names = "mac-address";
10999
status = "okay";
110100
};
111101

@@ -114,8 +104,6 @@
114104
managed = "in-band-status";
115105
phy-handle = <&qsgmii_phy3>;
116106
phy-mode = "qsgmii";
117-
nvmem-cells = <&base_mac_address 7>;
118-
nvmem-cell-names = "mac-address";
119107
status = "okay";
120108
};
121109

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,5 @@
5555
&enetc_port1 {
5656
phy-handle = <&phy0>;
5757
phy-mode = "rgmii-id";
58-
nvmem-cells = <&base_mac_address 0>;
59-
nvmem-cell-names = "mac-address";
6058
status = "okay";
6159
};

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,10 @@
3636
};
3737

3838
&enetc_port2 {
39-
nvmem-cells = <&base_mac_address 2>;
40-
nvmem-cell-names = "mac-address";
4139
status = "okay";
4240
};
4341

4442
&enetc_port3 {
45-
nvmem-cells = <&base_mac_address 3>;
46-
nvmem-cell-names = "mac-address";
4743
status = "okay";
4844
};
4945

@@ -56,8 +52,6 @@
5652
managed = "in-band-status";
5753
phy-handle = <&phy0>;
5854
phy-mode = "sgmii";
59-
nvmem-cells = <&base_mac_address 0>;
60-
nvmem-cell-names = "mac-address";
6155
status = "okay";
6256
};
6357

@@ -66,8 +60,6 @@
6660
managed = "in-band-status";
6761
phy-handle = <&phy1>;
6862
phy-mode = "sgmii";
69-
nvmem-cells = <&base_mac_address 1>;
70-
nvmem-cell-names = "mac-address";
7163
status = "okay";
7264
};
7365

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var4.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,5 @@
4343
&enetc_port1 {
4444
phy-handle = <&phy1>;
4545
phy-mode = "rgmii-id";
46-
nvmem-cells = <&base_mac_address 1>;
47-
nvmem-cell-names = "mac-address";
4846
status = "okay";
4947
};

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@
9292
phy-handle = <&phy0>;
9393
phy-mode = "sgmii";
9494
managed = "in-band-status";
95-
nvmem-cells = <&base_mac_address 0>;
96-
nvmem-cell-names = "mac-address";
9795
status = "okay";
9896
};
9997

@@ -156,21 +154,6 @@
156154
label = "bootloader environment";
157155
};
158156
};
159-
160-
otp-1 {
161-
compatible = "user-otp";
162-
163-
nvmem-layout {
164-
compatible = "kontron,sl28-vpd";
165-
166-
serial_number: serial-number {
167-
};
168-
169-
base_mac_address: base-mac-address {
170-
#nvmem-cell-cells = <1>;
171-
};
172-
};
173-
};
174157
};
175158
};
176159

0 commit comments

Comments
 (0)