From d61882783d528ff51890427fbefeade58056a954 Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Sat, 4 Jun 2022 17:27:51 +0200 Subject: [PATCH] ath79: TP-Link EAP245 v1: convert ath10k to nvmem-cells Add the PCIe node for the ath10k radio to the devicetree, and refer to the art partition for the calibration data using nvmem-cells. Use mac-address-increment to ensure the MAC address is set correctly, and remove the device from the caldata extraction and patching script. Signed-off-by: Sander Vanheule --- .../ath79/dts/qca9563_tplink_eap245-v1.dts | 18 ++++++++++++++++++ .../etc/hotplug.d/firmware/11-ath10k-caldata | 1 - 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts index 3da450192c2ec3..188326fd8046a2 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts @@ -42,3 +42,21 @@ }; }; }; + +&art { + calibration_ath10k: calibration@5000 { + reg = <0x5000 0x844>; + }; +}; + +&pcie { + wifi@0,0 { + compatible = "qcom,ath10k"; + reg = <0 0 0 0 0>; + + mac-address-increment = <1>; + + nvmem-cells = <&macaddr_info_8>, <&calibration_ath10k>; + nvmem-cell-names = "mac-address", "calibration"; + }; +}; diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 668fd76af3a43a..650d444fe63dcd 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -146,7 +146,6 @@ case "$FIRMWARE" in ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary romfs 0xf100) 2) ;; tplink,eap225-v1|\ - tplink,eap245-v1|\ tplink,re450-v2|\ tplink,re450-v3|\ tplink,re455-v1)