SW/openwrt
2
0
Fork 0
forked from Ivasoft/openwrt
Code Pull Requests Activity

kernel: backport NVMEM patch for U-Boot env data "ethaddr" cell

Browse Source 
Adjust our local code to avoid breakage.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki
2023-04-06 12:14:30 +02:00
parent 323072f3a6
commit 9a62b3977f
7 changed files with 183 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
View File

@@ -142,7 +142,7 @@
phy-handle = <&qca8081_28>;
label = "lan";
nvmem-cells = <&macaddr_ubootenv_ethaddr>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cell-names = "mac-address";
};
&qpic_bam {

26
target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
View File

@@ -220,6 +220,7 @@
reg = <0x600000 0x10000>;
macaddr_lan: ethaddr {
#nvmem-cell-cells = <1>;
};
};
@@ -349,49 +350,48 @@
status = "okay";
phy-handle = <&qca8075_1>;
label = "lan1";
nvmem-cells = <&macaddr_lan>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cells = <&macaddr_lan 0>;
nvmem-cell-names = "mac-address";
};
&dp2 {
status = "okay";
phy-handle = <&qca8075_2>;
label = "lan2";
nvmem-cells = <&macaddr_lan>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cells = <&macaddr_lan 0>;
nvmem-cell-names = "mac-address";
};
&dp3 {
status = "okay";
phy-handle = <&qca8075_3>;
label = "lan3";
nvmem-cells = <&macaddr_lan>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cells = <&macaddr_lan 0>;
nvmem-cell-names = "mac-address";
};
&dp4 {
status = "okay";
phy-handle = <&qca8075_4>;
label = "lan4";
nvmem-cells = <&macaddr_lan>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cells = <&macaddr_lan 0>;
nvmem-cell-names = "mac-address";
};
&dp5 {
status = "okay";
phy-handle = <&qca8081>;
label = "wan";
nvmem-cells = <&macaddr_lan>;
nvmem-cell-names = "mac-address-ascii";
mac-address-increment = <1>;
nvmem-cells = <&macaddr_lan 1>;
nvmem-cell-names = "mac-address";
};
&dp6_syn {
status = "okay";
phy-handle = <&aqr113c>;
label = "10g";
nvmem-cells = <&macaddr_lan>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cells = <&macaddr_lan 0>;
nvmem-cell-names = "mac-address";
};
&blsp1_i2c2 {

10
target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
View File

@@ -320,7 +320,7 @@
phy-handle = <&qca8075_2>;
label = "lan4";
nvmem-cells = <&macaddr_appsblenv_ethaddr>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cell-names = "mac-address";
};
&dp3 {
@@ -328,7 +328,7 @@
phy-handle = <&qca8075_3>;
label = "lan3";
nvmem-cells = <&macaddr_appsblenv_ethaddr>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cell-names = "mac-address";
};
&dp4 {
@@ -336,7 +336,7 @@
phy-handle = <&qca8075_4>;
label = "lan2";
nvmem-cells = <&macaddr_appsblenv_ethaddr>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cell-names = "mac-address";
};
&dp5_syn {
@@ -344,7 +344,7 @@
phy-handle = <&aqr113c_1>;
label = "wan";
nvmem-cells = <&macaddr_appsblenv_ethaddr>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cell-names = "mac-address";
};
&dp6_syn {
@@ -352,7 +352,7 @@
phy-handle = <&aqr113c_2>;
label = "lan1";
nvmem-cells = <&macaddr_appsblenv_ethaddr>;
nvmem-cell-names = "mac-address-ascii";
nvmem-cell-names = "mac-address";
};
&ssphy_0 {