diff options
| author | Rosen Penev | 2024-08-24 00:39:17 +0000 |
|---|---|---|
| committer | David Bauer | 2024-10-10 02:41:04 +0000 |
| commit | f8ca3519369998a24406bbfbcf5e30349b0530e7 (patch) | |
| tree | 5a8fdd37a9eb31d8e63aefb3e3eb88bb39807de5 | |
| parent | c3251f5d52aef636f0cec432a27bf90f7537e1e7 (diff) | |
| download | openwrt-f8ca3519369998a24406bbfbcf5e30349b0530e7.tar.gz | |
mpc85xx: handle MSM460 wifi mac in dts
Userspace handling is deprecated.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | target/linux/mpc85xx/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac | 5 | ||||
| -rw-r--r-- | target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/target/linux/mpc85xx/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac b/target/linux/mpc85xx/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac index 0e27dfb8cc..20ad8eb44f 100644 --- a/target/linux/mpc85xx/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac +++ b/target/linux/mpc85xx/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac @@ -20,11 +20,6 @@ enterasys,ws-ap3710i|\ extreme-networks,ws-ap3825i) mtd_get_mac_ascii cfg2 RADIOADDR${PHYNBR} > /sys${DEVPATH}/macaddress ;; -hpe,msm460) - wifi_mac=$(mtd_get_mac_binary colubris-bid 0x1f9bd) - [ "$PHYNBR" -eq 0 ] && echo "$wifi_mac" > /sys${DEVPATH}/macaddress - [ "$PHYNBR" -eq 1 ] && echo "$(macaddr_add $wifi_mac 16)" > /sys${DEVPATH}/macaddress - ;; ocedo,panda) mtd_get_mac_ascii uboot-env0 wmac$(($PHYNBR + 1)) > /sys${DEVPATH}/macaddress ;; diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts index 46f8e514c9..3666350271 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts @@ -175,6 +175,12 @@ 0x1000000 0x0 0x0 0x1000000 0x0 0x0 0x0 0x100000>; + + wifi@0,0 { + reg = <0x0000 0 0 0 0>; + nvmem-cells = <&macaddr_hwinfo_1f9bd 0>; + nvmem-cell-names = "mac-address"; + }; }; }; @@ -190,6 +196,12 @@ 0x1000000 0x0 0x0 0x1000000 0x0 0x0 0x0 0x100000>; + + wifi@0,0 { + reg = <0x0000 0 0 0 0>; + nvmem-cells = <&macaddr_hwinfo_1f9bd 16>; + nvmem-cell-names = "mac-address"; + }; }; }; |