diff options
| author | Rosen Penev | 2026-02-17 04:00:40 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-02-25 15:17:05 +0000 |
| commit | f5637607a25e28c47e25c1f4374aa2d7052f68d4 (patch) | |
| tree | 0d25ee558dcd7f2161d0b73937afaa1b2e158771 | |
| parent | 73a41c38e71bae8811306bc29f3ed65107bb8bd9 (diff) | |
| download | zorun-main.tar.gz | |
Userspace handling is deprecated. Once mac-base goes upstream, the patch
itself can go upstream as well.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22058
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | target/linux/bcm53xx/base-files/etc/board.d/02_network | 6 | ||||
| -rw-r--r-- | target/linux/bcm53xx/patches-6.12/340-meraki-mx6x-mac-base.patch | 53 |
2 files changed, 53 insertions, 6 deletions
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 5edf6ec9b8..f255edf8b5 100644 --- a/target/linux/bcm53xx/base-files/etc/board.d/02_network +++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network @@ -71,12 +71,6 @@ bcm53xx_setup_macs() etXmacaddr=$(nvram get et0macaddr) offset=5 ;; - meraki,mx64 | \ - meraki,mx64-a0 | \ - meraki,mx65) - etXmacaddr=$(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) - offset=1 - ;; *) etXmacaddr=$(nvram get et0macaddr) offset=1 diff --git a/target/linux/bcm53xx/patches-6.12/340-meraki-mx6x-mac-base.patch b/target/linux/bcm53xx/patches-6.12/340-meraki-mx6x-mac-base.patch new file mode 100644 index 0000000000..2582fde708 --- /dev/null +++ b/target/linux/bcm53xx/patches-6.12/340-meraki-mx6x-mac-base.patch @@ -0,0 +1,53 @@ +--- a/arch/arm/boot/dts/broadcom/bcm958625-meraki-alamo.dtsi ++++ b/arch/arm/boot/dts/broadcom/bcm958625-meraki-alamo.dtsi +@@ -254,11 +254,17 @@ + port@0 { + label = "wan1"; + reg = <0>; ++ ++ nvmem-cells = <&mac_address 1>; ++ nvmem-cell-names = "mac-address"; + }; + + port@1 { + label = "wan2"; + reg = <1>; ++ ++ nvmem-cells = <&mac_address 1>; ++ nvmem-cell-names = "mac-address"; + }; + + sgmii0: port@4 { +--- a/arch/arm/boot/dts/broadcom/bcm958625-meraki-kingpin.dtsi ++++ b/arch/arm/boot/dts/broadcom/bcm958625-meraki-kingpin.dtsi +@@ -154,6 +154,9 @@ + port@4 { + label = "wan"; + reg = <4>; ++ ++ nvmem-cells = <&mac_address 1>; ++ nvmem-cell-names = "mac-address"; + }; + + port@8 { +--- a/arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi ++++ b/arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi +@@ -39,7 +39,7 @@ + + &amac2 { + status = "okay"; +- nvmem-cells = <&mac_address>; ++ nvmem-cells = <&mac_address 0>; + nvmem-cell-names = "mac-address"; + }; + +@@ -62,7 +62,9 @@ + #size-cells = <1>; + + mac_address: mac-address@66 { ++ compatible = "mac-base"; + reg = <0x66 0x6>; ++ #nvmem-cell-cells = <1>; + }; + }; + }; |