diff options
| author | Nick Hainke <vincent@systemli.org> | 2022-12-15 18:09:21 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-12-17 20:40:29 +0100 |
| commit | 46077860c2be38164aa41f00790c2cd9384d4023 (patch) | |
| tree | a8b827b702c135912a8a94d5034676382029ae29 /target/linux/ath79 | |
| parent | 74b7d6960158422b8fb0ccaa4bb52f6838990e23 (diff) | |
| download | upstream-46077860c2be38164aa41f00790c2cd9384d4023.tar.gz upstream-46077860c2be38164aa41f00790c2cd9384d4023.tar.bz2 upstream-46077860c2be38164aa41f00790c2cd9384d4023.zip | |
ath79: convert boards based on ar9344_openmesh_mr600.dtsi 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/ar9344_openmesh_mr600.dtsi | 38 | ||||
| -rw-r--r-- | target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 2 |
2 files changed, 21 insertions, 19 deletions
diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi index 5a6ef3b0fc..b35d699bdc 100644 --- a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi +++ b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi @@ -70,10 +70,26 @@ reg = <0x850000 0x7a0000>; }; - art: partition@ff0000 { + partition@ff0000 { label = "ART"; reg = <0xff0000 0x010000>; read-only; + + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_art_0: macaddr@0 { + reg = <0x0 0x6>; + }; + + calibration_art_1000: calibration@1000 { + reg = <0x1000 0x440>; + }; + + calibration_art_5000: calibration@5000 { + reg = <0x5000 0x440>; + }; }; }; }; @@ -111,9 +127,8 @@ &wmac { status = "okay"; - 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 = <1>; }; @@ -123,22 +138,11 @@ ath9k: wifi@0,0 { compatible = "pci168c,0030"; reg = <0x0000 0 0 0 0>; - qca,no-eeprom; - 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 = <8>; gpio-controller; #gpio-cells = <2>; }; }; - -&art { - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_art_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 9640baac17..98d760fa42 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,8 +112,6 @@ case "$FIRMWARE" in tplink,tl-wr842n-v1) caldata_extract "art" 0x1000 0x1000 ;; - openmesh,mr600-v1|\ - openmesh,mr600-v2|\ openmesh,om5p-an) caldata_extract "ART" 0x5000 0x440 ;; |