diff options
| author | Nick Hainke <vincent@systemli.org> | 2022-12-15 18:18:16 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-12-17 20:40:30 +0100 |
| commit | d4ec4f9d0b83fbb79bbcd14e1022069e0024e46b (patch) | |
| tree | 08ef21b774ab2e9dfffbaa2693f4a0dc9d350322 /target/linux/ath79 | |
| parent | f6ca84bf02a816fa66bc656f0f7d3c233207d65c (diff) | |
| download | upstream-d4ec4f9d0b83fbb79bbcd14e1022069e0024e46b.tar.gz upstream-d4ec4f9d0b83fbb79bbcd14e1022069e0024e46b.tar.bz2 upstream-d4ec4f9d0b83fbb79bbcd14e1022069e0024e46b.zip | |
ath79: convert OpenMesh OM2P v1 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.
Merge art into partition node.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'target/linux/ath79')
| -rw-r--r-- | target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts | 35 | ||||
| -rw-r--r-- | target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 3 |
2 files changed, 19 insertions, 19 deletions
diff --git a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts index 456724a750..a66d914015 100644 --- a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts +++ b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts @@ -122,10 +122,26 @@ reg = <0x8c0000 0x700000>; }; - art: partition@fc0000 { + partition@fc0000 { label = "ART"; reg = <0xfc0000 0x040000>; read-only; + + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_art_0: macaddr@0 { + reg = <0x0 0x6>; + }; + + macaddr_art_6: macaddr@6 { + reg = <0x6 0x6>; + }; + + calibration_art_1000: calibration@1000 { + reg = <0x1000 0x440>; + }; }; }; }; @@ -149,22 +165,9 @@ wifi@0,0 { compatible = "pci168c,002a"; reg = <0x0000 0 0 0 0>; - qca,no-eeprom; + nvmem-cells = <&calibration_art_1000>; + nvmem-cell-names = "calibration"; #gpio-cells = <2>; gpio-controller; }; }; - -&art { - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_art_0: macaddr@0 { - reg = <0x0 0x6>; - }; - - macaddr_art_6: macaddr@6 { - reg = <0x6 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 aa76d1bc9f..ebcac0b6b2 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 @@ -112,9 +112,6 @@ case "$FIRMWARE" in tplink,tl-wr842n-v1) caldata_extract "art" 0x1000 0x1000 ;; - openmesh,om2p-v1) - caldata_extract "ART" 0x1000 0x440 - ;; wd,mynet-n600|\ wd,mynet-n750) caldata_extract "art" 0x5000 0x440 |