Commit 916508c3 authored by Michael Walle's avatar Michael Walle Committed by Shawn Guo

Revert "arm64: dts: ls1028a: sl28: get MAC addresses from VPD"

With commit b203e6f1 ("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: b203e6f1 ("arm64: dts: ls1028a: sl28: get MAC addresses from VPD")
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent fd4334a0
...@@ -56,14 +56,10 @@ qsgmii_phy3: ethernet-phy@10 { ...@@ -56,14 +56,10 @@ qsgmii_phy3: ethernet-phy@10 {
}; };
&enetc_port2 { &enetc_port2 {
nvmem-cells = <&base_mac_address 2>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
&enetc_port3 { &enetc_port3 {
nvmem-cells = <&base_mac_address 3>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
...@@ -84,8 +80,6 @@ &mscc_felix_port0 { ...@@ -84,8 +80,6 @@ &mscc_felix_port0 {
managed = "in-band-status"; managed = "in-band-status";
phy-handle = <&qsgmii_phy0>; phy-handle = <&qsgmii_phy0>;
phy-mode = "qsgmii"; phy-mode = "qsgmii";
nvmem-cells = <&base_mac_address 4>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
...@@ -94,8 +88,6 @@ &mscc_felix_port1 { ...@@ -94,8 +88,6 @@ &mscc_felix_port1 {
managed = "in-band-status"; managed = "in-band-status";
phy-handle = <&qsgmii_phy1>; phy-handle = <&qsgmii_phy1>;
phy-mode = "qsgmii"; phy-mode = "qsgmii";
nvmem-cells = <&base_mac_address 5>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
...@@ -104,8 +96,6 @@ &mscc_felix_port2 { ...@@ -104,8 +96,6 @@ &mscc_felix_port2 {
managed = "in-band-status"; managed = "in-band-status";
phy-handle = <&qsgmii_phy2>; phy-handle = <&qsgmii_phy2>;
phy-mode = "qsgmii"; phy-mode = "qsgmii";
nvmem-cells = <&base_mac_address 6>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
...@@ -114,8 +104,6 @@ &mscc_felix_port3 { ...@@ -114,8 +104,6 @@ &mscc_felix_port3 {
managed = "in-band-status"; managed = "in-band-status";
phy-handle = <&qsgmii_phy3>; phy-handle = <&qsgmii_phy3>;
phy-mode = "qsgmii"; phy-mode = "qsgmii";
nvmem-cells = <&base_mac_address 7>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
......
...@@ -55,7 +55,5 @@ &enetc_port0 { ...@@ -55,7 +55,5 @@ &enetc_port0 {
&enetc_port1 { &enetc_port1 {
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
nvmem-cells = <&base_mac_address 0>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
...@@ -36,14 +36,10 @@ &enetc_port0 { ...@@ -36,14 +36,10 @@ &enetc_port0 {
}; };
&enetc_port2 { &enetc_port2 {
nvmem-cells = <&base_mac_address 2>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
&enetc_port3 { &enetc_port3 {
nvmem-cells = <&base_mac_address 3>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
...@@ -56,8 +52,6 @@ &mscc_felix_port0 { ...@@ -56,8 +52,6 @@ &mscc_felix_port0 {
managed = "in-band-status"; managed = "in-band-status";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; phy-mode = "sgmii";
nvmem-cells = <&base_mac_address 0>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
...@@ -66,8 +60,6 @@ &mscc_felix_port1 { ...@@ -66,8 +60,6 @@ &mscc_felix_port1 {
managed = "in-band-status"; managed = "in-band-status";
phy-handle = <&phy1>; phy-handle = <&phy1>;
phy-mode = "sgmii"; phy-mode = "sgmii";
nvmem-cells = <&base_mac_address 1>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
......
...@@ -43,7 +43,5 @@ vddh: vddh-regulator { ...@@ -43,7 +43,5 @@ vddh: vddh-regulator {
&enetc_port1 { &enetc_port1 {
phy-handle = <&phy1>; phy-handle = <&phy1>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
nvmem-cells = <&base_mac_address 1>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
...@@ -92,8 +92,6 @@ &enetc_port0 { ...@@ -92,8 +92,6 @@ &enetc_port0 {
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; phy-mode = "sgmii";
managed = "in-band-status"; managed = "in-band-status";
nvmem-cells = <&base_mac_address 0>;
nvmem-cell-names = "mac-address";
status = "okay"; status = "okay";
}; };
...@@ -156,21 +154,6 @@ partition@3e0000 { ...@@ -156,21 +154,6 @@ partition@3e0000 {
label = "bootloader environment"; label = "bootloader environment";
}; };
}; };
otp-1 {
compatible = "user-otp";
nvmem-layout {
compatible = "kontron,sl28-vpd";
serial_number: serial-number {
};
base_mac_address: base-mac-address {
#nvmem-cell-cells = <1>;
};
};
};
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment