diff options
| author | Nick Hainke <vincent@systemli.org> | 2022-12-15 09:20:22 +0100 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2022-12-15 15:08:08 +0100 |
| commit | 1b125aabf4c5deb54bc5ea7f1bc3f8516f5ff79c (patch) | |
| tree | e23797855b1c7cd3762ea806ca0c9cd09ef36a25 /target/linux | |
| parent | 708ea56fb9e2b4ab77e726085d572bf80a4cc76a (diff) | |
| download | upstream-1b125aabf4c5deb54bc5ea7f1bc3f8516f5ff79c.tar.gz upstream-1b125aabf4c5deb54bc5ea7f1bc3f8516f5ff79c.tar.bz2 upstream-1b125aabf4c5deb54bc5ea7f1bc3f8516f5ff79c.zip | |
ath79: convert Araknis AN-300-AP-I-N WiFis to nvmem-cells
Pull the calibration data from the nvmem subsystem. This allows us to
move userspace caldata extraction into the device-tree definition.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts | 19 | ||||
| -rw-r--r-- | target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 1 |
2 files changed, 12 insertions, 8 deletions
diff --git a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts index a886b4c001..07dc8da506 100644 --- a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts +++ b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts @@ -87,11 +87,10 @@ ath9k: wifi@0,0,0 { compatible = "pci168c,0030"; reg = <0x0 0 0 0 0>; - nvmem-cells = <&macaddr_art_0>; - nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>; + nvmem-cell-names = "mac-address", "calibration"; mac-address-increment = <1>; qca,disable-5ghz; - qca,no-eeprom; #gpio-cells = <2>; gpio-controller; }; @@ -102,10 +101,8 @@ qca,disable-2ghz; - mtd-cal-data = <&art 0x1000>; - - nvmem-cells = <&macaddr_art_0>; - nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>; + nvmem-cell-names = "mac-address", "calibration"; mac-address-increment = <2>; }; @@ -117,4 +114,12 @@ macaddr_art_0: macaddr@0 { reg = <0x0 0x6>; }; + + calibration_art_1000: calibration@1000 { + reg = <0x1000 0x440>; + }; + + calibration_art_5000: calibration@5000 { + reg = <0x5000 0x440>; + }; }; diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index d6d5b257ff..52f015ed5f 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -83,7 +83,6 @@ case "$FIRMWARE" in ;; "ath9k-eeprom-pci-0000:00:00.0.bin") case $board in - araknis,an-300-ap-i-n|\ atheros,db120|\ engenius,eap600|\ engenius,ecb600|\ |