mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
ipq40xx: fix MAC address on Meraki MR33 and MR74 after nvmem-layout
...conversion. Commit20736013e9
("kernel: backport nvmem v6.6 fixes and v6.7 changes") has causedt he device to no longer correctly read MAC address from its onboard 24c64 EEPROM, because "at24" driver doesn't support legacy nvmem-cell bindings [1] - and there was an explicit config option added to mandate that behaviour in the following patch: 820-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch But some of the devices, MR33 and MR74 included, weren't converted with that as well. Convert the definition to use proper fixed-layout binding to fix it. The offending change was introduced between v23.05.0 and v23.05.1, and found by bisection: git bisect start # status: waiting for both good and bad commits # good: [bd4f415efa
] OpenWrt v23.05.0: adjust config defaults git bisect goodbd4f415efa
# status: waiting for bad commit, 1 good commit known # bad: [a58a86693f
] OpenWrt v23.05.1: adjust config defaults git bisect bada58a86693f
# good: [3d0a78add2
] qualcommax: only build initramfs if CONFIG_TARGET_ROOTFS_INITRAMFS is set git bisect good3d0a78add2
# bad: [21e5db97c4
] build: add CycloneDX SBOM JSON support git bisect bad21e5db97c4
# good: [89184b15cf
] mediatek: add build for MT7981 RFB git bisect good89184b15cf
# bad: [41f27bbb6d
] bcm53xx: add the latest fix version of brcm_nvram git bisect bad41f27bbb6d
# good: [b649b0bf71
] kernel: nvmem: fix "fixed-layout" & support "mac-base" git bisect goodb649b0bf71
# bad: [20736013e9
] kernel: backport nvmem v6.6 fixes and v6.7 changes git bisect bad20736013e9
# good: [066971615f
] kernel: backport v6.6 nvmem changes git bisect good066971615f
# first bad commit: [20736013e9
] kernel: backport nvmem v6.6 fixes and v6.7 changes Link: [1] https://github.com/openwrt/openwrt/issues/15393#issuecomment-2212300849 Fixes:20736013e9
("kernel: backport nvmem v6.6 fixes and v6.7 changes") Fixes: https://github.com/openwrt/openwrt/issues/15393 Signed-off-by: Lech Perczak <lech.perczak@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16623 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
d51353db26
commit
06791742a0
@ -128,13 +128,17 @@
|
||||
pagesize = <32>;
|
||||
reg = <0x50>;
|
||||
read-only; /* This holds our MAC & Meraki board-data */
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
mac_address: mac-address@66 {
|
||||
compatible = "mac-base";
|
||||
reg = <0x66 0x6>;
|
||||
#nvmem-cell-cells = <1>;
|
||||
nvmem-layout {
|
||||
compatible = "fixed-layout";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
mac_address: mac-address@66 {
|
||||
compatible = "mac-base";
|
||||
reg = <0x66 0x6>;
|
||||
#nvmem-cell-cells = <1>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user