bcm53xx: ac87u: set WAN MAC in dts

Userspace handling is deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22059
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network
index f255edf8b5c133c3d2a5ff8c57621f97658fb808..7e9caf6522899fe0bab8374f96bc1b8308f565cc 100644 (file)
--- a/target/linux/bcm53xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network
@@ -53,10 +53,6 @@ bcm53xx_setup_macs()
        wan_macaddr="$(nvram get wan_hwaddr)"
 
        case "$board" in
-       asus,rt-ac87u)
-               etXmacaddr=$(nvram get et1macaddr)
-               offset=1
-               ;;
        dlink,dir-885l | \
        linksys,ea9200 | \
        linksys,panamera | \

diff --git a/target/linux/bcm53xx/patches-6.12/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch b/target/linux/bcm53xx/patches-6.12/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch
index 9cfc3aac15aaf0dda8e254358b8b739dc756c21e..db49e5b1645cf40ce0988cd43459ff36acfb7dc3 100644 (file)
--- a/target/linux/bcm53xx/patches-6.12/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch
+++ b/target/linux/bcm53xx/patches-6.12/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch
@@ -318,7 +318,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 +};
 --- a/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
 +++ b/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
-@@ -77,6 +77,40 @@
+@@ -77,6 +77,43 @@
        status = "okay";
  };
  
@@ -328,6 +328,9 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 +      ports {
 +              port@0 {
 +                      label = "wan";
++
++                      nvmem-cells = <&et1macaddr 1>;
++                      nvmem-cell-names = "mac-address";
 +              };
 +
 +              port@1 {

diff --git a/target/linux/bcm53xx/patches-6.18/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch b/target/linux/bcm53xx/patches-6.18/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch
index 9cfc3aac15aaf0dda8e254358b8b739dc756c21e..db49e5b1645cf40ce0988cd43459ff36acfb7dc3 100644 (file)
--- a/target/linux/bcm53xx/patches-6.18/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch
+++ b/target/linux/bcm53xx/patches-6.18/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch
@@ -318,7 +318,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 +};
 --- a/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
 +++ b/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
-@@ -77,6 +77,40 @@
+@@ -77,6 +77,43 @@
        status = "okay";
  };
  
@@ -328,6 +328,9 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 +      ports {
 +              port@0 {
 +                      label = "wan";
++
++                      nvmem-cells = <&et1macaddr 1>;
++                      nvmem-cell-names = "mac-address";
 +              };
 +
 +              port@1 {