For v2, both ath9k (2.4GHz Wifi) and ath10k (5 GHz) driver now
pull the (pre-)calibration data from the nvmem subsystem. v1
is slightly different as only the ath9k Wifi is supported.
This allows us to move the userspace caldata extraction
and mac-address patching for the 5GHZ ath10k supported
wifi into the device-tree definition of the device.
ath9k's nodes are also changed over to use nvmem-cells
over OpenWrt's custom mtd-cal-data property.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
reg = <0x020000 0x7d0000>;
};
reg = <0x020000 0x7d0000>;
};
- art: partition@7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ compatible = "nvmem-cells";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ calibration_art_1000: calibration@1000 {
+ reg = <0x1000 0x440>;
+ };
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&calibration_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
label = "art";
reg = <0xff0000 0x010000>;
read-only;
label = "art";
reg = <0xff0000 0x010000>;
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 0x844>;
+ };
nvmem-cell-names = "mac-address";
};
nvmem-cell-names = "mac-address";
};
-&wmac {
- mtd-cal-data = <&art 0x1000>;
+&pcie1 {
+ status = "okay";
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ wifi@0,0 {
+ compatible = "qcom,ath10k";
+ reg = <0 0 0 0 0>;
+
+ mac-address-increment = <(-1)>;
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&calibration_art_5000>;
+ nvmem-cell-names = "mac-address", "calibration";
+ };
+};
+
+&wmac {
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&calibration_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1)
;;
tplink,archer-c5-v1|\
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1)
;;
tplink,archer-c5-v1|\
tplink,tl-wdr7500-v3)
caldata_extract "art" 0x5000 0x844
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x1fc00) -1)
tplink,tl-wdr7500-v3)
caldata_extract "art" 0x5000 0x844
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x1fc00) -1)