From 7cf3a37957573576dac56978b0613f701853f7e2 Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Sun, 5 Jun 2022 11:57:04 +0200 Subject: [PATCH] ath79: TP-Link EAP225 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_eap225-v1.dts | 18 ++++++++++++++++++ .../etc/hotplug.d/firmware/11-ath10k-caldata | 13 ++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts index 20fd55b409e4e..f4ac2c6d8db47 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts @@ -49,3 +49,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 650d444fe63dc..4e640f9e1b459 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 @@ -145,13 +145,6 @@ case "$FIRMWARE" in caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary romfs 0xf100) 2) ;; - tplink,eap225-v1|\ - tplink,re450-v2|\ - tplink,re450-v3|\ - tplink,re455-v1) - caldata_extract "art" 0x5000 0x844 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) 1) - ;; tplink,re350k-v1) caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) 2) @@ -161,6 +154,12 @@ case "$FIRMWARE" in caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2) ;; + tplink,re450-v2|\ + tplink,re450-v3|\ + tplink,re455-v1) + caldata_extract "art" 0x5000 0x844 + ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) 1) + ;; tplink,tl-wpa8630-v1) caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x0fc00) 1)