lantiq: add missing WAN MAC override

In the original userspace implementation, the WAN and DSL interfaces
used the same MAC. Mirror that here.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21081
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse.dtsi
index 86831554fe19d71733c94a2da5ba5203f65230d7..042b7f828a939f90fa38b19ac17f153a5e696a0e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse.dtsi
@@ -222,7 +222,7 @@
                        reg = <0xe105300 0x100>;
                };
 
-               ppe@e234000 {
+               ppe: ppe@e234000 {
                        compatible = "lantiq,ppe-ase";
                        reg = <0xe234000 0x40000>;
                        interrupt-parent = <&icu0>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
index 89fee57a5615a5f3d9a0a98facb284e55d100c28..08b78033a23f93e6d27fa351a600a483c9189817 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
@@ -78,6 +78,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_uboot_ethaddr 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &localbus {
        flash@0 {
                compatible = "lantiq,nor";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
index 4a673801588300a906ff618a12c1a2230a515862..2990c06006f00b0f69de9cce507dd4582d720381 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
@@ -57,6 +57,16 @@
        };
 };
 
+&eth0 {
+       nvmem-cells = <&macaddr_uboot_ethaddr 0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&ppe {
+       nvmem-cells = <&macaddr_uboot_ethaddr 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gphy0 {
        lantiq,gphy-mode = <GPHY_MODE_GE>;
 };
@@ -69,8 +79,6 @@
        pinctrl-0 = <&gphy0_led0_pins>, <&gphy0_led1_pins>, <&gphy0_led2_pins>,
                    <&gphy1_led0_pins>, <&gphy1_led1_pins>, <&gphy1_led2_pins>;
        pinctrl-names = "default";
-       nvmem-cells = <&macaddr_uboot_ethaddr 0>;
-       nvmem-cell-names = "mac-address";
 };
 
 &gswip_mdio {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
index eb4e4305bc7d3bea25fd9ceb583282d5853d49c3..c9f1c83ffaecd2999e715f813a7300a8d78a614a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
@@ -116,6 +116,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_boardconfig_16 2>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gphy0 {
        lantiq,gphy-mode = <GPHY_MODE_FE>;
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index 1d2b1819c6e28ef4ab8c75acd2476f131d7707eb..4901fd7223bf2ed8518b87c73ce38f7c1db4ffd4 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
@@ -216,6 +216,8 @@
                label = "wan";
                phy-mode = "rgmii";
                phy-handle = <&phy5>;
+               nvmem-cells = <&macaddr_boardconfig_16 0>;
+               nvmem-cell-names = "mac-address";
        };
 };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts
index b922e385e57be49768c83f28a37c753dc7679f09..5840b66c6e3e96e1998e7c021532fa273144fef5 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts
@@ -314,6 +314,8 @@
                label = "wan";
                phy-mode = "internal";
                phy-handle = <&phy13>;
+               nvmem-cells = <&macaddr_boardconfig_16 0>;
+               nvmem-cell-names = "mac-address";
        };
        port@5 {
                reg = <5>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index 2d31e40f423730ecb0540fbde9491cb7962e2044..e89071ee4878fccfcc1c4187d8513df262472645 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
@@ -226,11 +226,6 @@
        };
 };
 
-&ppe {
-       nvmem-cells = <&macaddr_caldata_110c 4>;
-       nvmem-cell-names = "mac-address";
-};
-
 &localbus {
        flash@1 {
                compatible = "lantiq,nand-xway";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
index 4d685bee66127130798bc9a05ca316e4d83333df..97de7eb30b6d7f6fdacc4b48b72afc0916b69f9c 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
@@ -106,6 +106,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_uboot_ethaddr 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gphy0 {
        lantiq,gphy-mode = <GPHY_MODE_GE>;
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
index 9d4a4e7e92902aaa5f5568ac5ee3e3c68a191ee3..deb698475072d0ff5c69e4707493f41a095f4020 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
@@ -157,10 +157,18 @@
                    <&gphy0_led1_pins>, <&gphy0_led2_pins>,
                    <&gphy1_led1_pins>, <&gphy1_led2_pins>;
        pinctrl-names = "default";
+};
+
+&eth0 {
        nvmem-cells = <&macaddr_uboot_ethaddr 0>;
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_uboot_ethaddr 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gswip_mdio {
        phy0: ethernet-phy@0 {
                reg = <0x0>;