From 02f40d63e23a67aad34aae01079352ae6f690e2c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 7 Dec 2025 18:11:02 -0800 Subject: [PATCH] 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 Link: https://github.com/openwrt/openwrt/pull/21081 Signed-off-by: Robert Marko --- .../files/arch/mips/boot/dts/lantiq/amazonse.dtsi | 2 +- .../boot/dts/lantiq/amazonse_allnet_all0333cj.dts | 5 +++++ .../mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts | 12 ++++++++++-- .../boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi | 5 +++++ .../mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi | 2 ++ .../boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts | 2 ++ .../arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts | 5 ----- .../mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi | 5 +++++ .../mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi | 8 ++++++++ 9 files changed, 38 insertions(+), 8 deletions(-) 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 86831554fe..042b7f828a 100644 --- 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 89fee57a56..08b78033a2 100644 --- 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 4a67380158..2990c06006 100644 --- 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 @@ }; }; +ð0 { + 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 = ; }; @@ -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 eb4e4305bc..c9f1c83ffa 100644 --- 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 = ; }; 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 1d2b1819c6..4901fd7223 100644 --- 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 b922e385e5..5840b66c6e 100644 --- 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 2d31e40f42..e89071ee48 100644 --- 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 4d685bee66..97de7eb30b 100644 --- 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 = ; }; 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 9d4a4e7e92..deb6984750 100644 --- 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"; +}; + +ð0 { 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>;