aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq807x/files/arch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2023-04-06 12:14:30 +0200
committerRafał Miłecki <rafal@milecki.pl>2023-04-06 12:21:29 +0200
commit9a62b3977f7c2aa3ff3e25013069dee07c5296d7 (patch)
tree39fdf0564b5d922b7083d171e5f476cf053e539b /target/linux/ipq807x/files/arch
parent323072f3a6fb709d5a20dbd1375816e8c041a85b (diff)
downloadupstream-9a62b3977f7c2aa3ff3e25013069dee07c5296d7.tar.gz
upstream-9a62b3977f7c2aa3ff3e25013069dee07c5296d7.tar.bz2
upstream-9a62b3977f7c2aa3ff3e25013069dee07c5296d7.zip
kernel: backport NVMEM patch for U-Boot env data "ethaddr" cell
Adjust our local code to avoid breakage. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/ipq807x/files/arch')
-rw-r--r--target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts2
-rw-r--r--target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts26
-rw-r--r--target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts10
3 files changed, 19 insertions, 19 deletions
diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
index 786d461e89..5bfcdcc8ca 100644
--- a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
+++ b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
@@ -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 {
diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
index 537dd52032..d113b233ec 100644
--- a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
+++ b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
@@ -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 {
diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
index d9b083c4d0..32386dc93e 100644
--- a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
+++ b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
@@ -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 {