diff options
| author | Nick Hainke <vincent@systemli.org> | 2022-12-15 10:08:39 +0100 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2022-12-15 15:45:47 +0100 |
| commit | 08c114ee16ae5aa3c07241c36e6f76cc7abcd137 (patch) | |
| tree | d33354fa6eb742743a4d03ed6d4389a0571ac9f5 /target/linux | |
| parent | fd456106aa8730bb9d407b66d1eef5e26b5cb63e (diff) | |
| download | upstream-08c114ee16ae5aa3c07241c36e6f76cc7abcd137.tar.gz upstream-08c114ee16ae5aa3c07241c36e6f76cc7abcd137.tar.bz2 upstream-08c114ee16ae5aa3c07241c36e6f76cc7abcd137.zip | |
ath79: convert Winchannel WB2000 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>
(removed mtd-cal-data property, merged art + addr nodes back into
partition)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ath79/dts/ar9344_winchannel_wb2000.dts | 43 | ||||
| -rw-r--r-- | target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 3 |
2 files changed, 26 insertions, 20 deletions
diff --git a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts index cb59559426..cbde191ac7 100644 --- a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts +++ b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts @@ -119,16 +119,36 @@ read-only; }; - art: partition@fe0000 { + partition@fe0000 { label = "art"; reg = <0xfe0000 0x10000>; read-only; + + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + calibration_art_1000: calibration@1000 { + reg = <0x1000 0x440>; + }; + + calibration_art_5000: calibration@5000 { + reg = <0x5000 0x440>; + }; }; - addr: partition@ff0000 { + partition@ff0000 { label = "addr"; reg = <0xff0000 0x10000>; read-only; + + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_addr_0: macaddr@0 { + reg = <0x0 0x6>; + }; }; }; }; @@ -140,9 +160,8 @@ ath9k: wifi@0,0 { compatible = "pci168c,0030"; reg = <0x0000 0 0 0 0>; - qca,no-eeprom; - nvmem-cells = <&macaddr_addr_0>; - nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_addr_0>, <&calibration_art_5000>; + nvmem-cell-names = "mac-address", "calibration"; mac-address-increment = <0x10>; #gpio-cells = <2>; gpio-controller; @@ -160,9 +179,8 @@ &wmac { status = "okay"; - mtd-cal-data = <&art 0x1000>; - nvmem-cells = <&macaddr_addr_0>; - nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_addr_0>, <&calibration_art_1000>; + nvmem-cell-names = "mac-address", "calibration"; }; &mdio0 { @@ -193,12 +211,3 @@ }; }; -&addr { - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_addr_0: macaddr@0 { - reg = <0x0 0x6>; - }; -}; 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 a91885c3fe..9640baac17 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,9 +83,6 @@ case "$FIRMWARE" in ;; "ath9k-eeprom-pci-0000:00:00.0.bin") case $board in - winchannel,wb2000) - caldata_extract "art" 0x5000 0x440 - ;; avm,fritz300e) caldata_extract_reverse "urloader" 0x1541 0x440 ;; |