ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-12 13:45:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ath79: convert Netgear WNDAP360 WiFis to nvmem-cells

Browse Source 
Pull the calibration data from the nvmem subsystem. This allows us to
move userspace caldata extraction into the device-tree definition.

Merge art into partition node.

Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Nick Hainke 2022-12-22 23:51:16 +01:00 committed by Hauke Mehrtens
parent 0820d62012
commit aa6c8c38ea
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
target/linux/ath79/dts/ar7161_netgear_wndap360.dts
View File

@ -107,10 +107,34 @@
read-only; read-only;
}; };
art: partition@7f0000 { partition@7f0000 {
label = "art"; label = "art";
reg = <0x7f0000 0x010000>; reg = <0x7f0000 0x010000>;
read-only; read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_120c: macaddr@120c {
reg = <0x120c 0x6>;
};
macaddr_art_520c: macaddr@520c {
reg = <0x520c 0x6>;
};
calibration_art_1000: calibration@1000 {
reg = <0x1000 0xeb8>;
};
calibration_art_5000: calibration@5000 {
reg = <0x5000 0xeb8>;
};
}; };
}; };
}; };
@ -122,9 +146,8 @@
ath9k0: wifi@0,11 { ath9k0: wifi@0,11 {
compatible = "pci168c,0029"; compatible = "pci168c,0029";
reg = <0x8800 0 0 0 0>; reg = <0x8800 0 0 0 0>;
qca,no-eeprom; nvmem-cells = <&macaddr_art_120c>, <&calibration_art_1000>;
nvmem-cells = <&macaddr_art_120c>; nvmem-cell-names = "mac-address", "calibration";
nvmem-cell-names = "mac-address";
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };
@ -132,30 +155,10 @@
ath9k1: wifi@0,12 { ath9k1: wifi@0,12 {
compatible = "pci168c,0029"; compatible = "pci168c,0029";
reg = <0x9000 0 0 0 0>; reg = <0x9000 0 0 0 0>;
qca,no-eeprom; nvmem-cells = <&macaddr_art_520c>, <&calibration_art_5000>;
nvmem-cells = <&macaddr_art_520c>; nvmem-cell-names = "mac-address", "calibration";
nvmem-cell-names = "mac-address";
mac-address-increment = <1>; mac-address-increment = <1>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };
}; };
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_120c: macaddr@120c {
reg = <0x120c 0x6>;
};
macaddr_art_520c: macaddr@520c {
reg = <0x520c 0x6>;
};
};

6
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View File

@ -124,8 +124,7 @@ case "$FIRMWARE" in
"ath9k-eeprom-pci-0000:00:11.0.bin") "ath9k-eeprom-pci-0000:00:11.0.bin")
case $board in case $board in
buffalo,wzr-600dhp|\ buffalo,wzr-600dhp|\
buffalo,wzr-hp-ag300h|\ buffalo,wzr-hp-ag300h)
netgear,wndap360)
caldata_extract "art" 0x1000 0xeb8 caldata_extract "art" 0x1000 0xeb8
;; ;;
dlink,dir-825-b1|\ dlink,dir-825-b1|\
@ -144,8 +143,7 @@ case "$FIRMWARE" in
"ath9k-eeprom-pci-0000:00:12.0.bin") "ath9k-eeprom-pci-0000:00:12.0.bin")
case $board in case $board in
buffalo,wzr-600dhp|\ buffalo,wzr-600dhp|\
buffalo,wzr-hp-ag300h|\ buffalo,wzr-hp-ag300h)
netgear,wndap360)
caldata_extract "art" 0x5000 0xeb8 caldata_extract "art" 0x5000 0xeb8
;; ;;
dlink,dir-825-b1|\ dlink,dir-825-b1|\

2
target/linux/ath79/image/generic.mk
View File

@ -1763,7 +1763,7 @@ define Device/netgear_wndap360
$(Device/netgear_generic) $(Device/netgear_generic)
SOC := ar7161 SOC := ar7161
DEVICE_MODEL := WNDAP360 DEVICE_MODEL := WNDAP360
DEVICE_PACKAGES := kmod-leds-reset kmod-owl-loader DEVICE_PACKAGES := kmod-leds-reset
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
BLOCKSIZE := 256k BLOCKSIZE := 256k
KERNEL := kernel-bin | append-dtb | gzip | uImage gzip KERNEL := kernel-bin | append-dtb | gzip | uImage gzip