mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-03-03 21:53:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

bcm53xx: meraki mx6x: use nvmem MAC assignment
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Details

Browse source 
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>
This commit is contained in:
Rosen Penev 2026-02-16 20:00:40 -08:00 • committed by Robert Marko
parent 73a41c38e7
commit f5637607a2
2 changed files with 53 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/bcm53xx/base-files/etc/board.d/02_network
View file

@ -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

53
target/linux/bcm53xx/patches-6.12/340-meraki-mx6x-mac-base.patch Normal file
View file

@ -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>;
};
};
};