Skip to content

Commit

Permalink
ath79: TP-Link EAP245 v3: convert radios to nvmem-cells
Browse files Browse the repository at this point in the history
Replace the mtd-cal-data phandle by an nvmem-cell reference from the art
partition for the 2.4GHz ath9k radio.

Add the PCIe node for the ath10k radio to the devicetree, and refer to
the art partition for the calibration data using an nvmem-cell.

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 <sander@svanheule.net>
  • Loading branch information
svanheule committed Jun 16, 2022
1 parent eca0d73 commit d4b3b23
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 8 deletions.
29 changes: 25 additions & 4 deletions target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
Expand Up @@ -46,6 +46,16 @@

&pcie {
status = "okay";

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";
};
};

&spi {
Expand Down Expand Up @@ -85,10 +95,22 @@
read-only;
};

art: partition@a0000 {
partition@a0000 {
label = "art";
reg = <0x0a0000 0x010000>;
read-only;

compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;

calibration_ath9k: calibration@1000 {
reg = <0x1000 0x440>;
};

calibration_ath10k: calibration@5000 {
reg = <0x5000 0x2f20>;
};
};

partition@b0000 {
Expand Down Expand Up @@ -151,9 +173,8 @@
&wmac {
status = "okay";

mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_info_8>, <&calibration_ath9k>;
nvmem-cell-names = "mac-address", "calibration";
};

&info {
Expand Down
Expand Up @@ -256,10 +256,6 @@ case "$FIRMWARE" in
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
;;
tplink,eap245-v3)
caldata_extract "art" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) 1)
;;
xiaomi,aiot-ac2350)
caldata_extract "art" 0x5000 0x2f20
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
Expand Down

0 comments on commit d4b3b23

Please sign in to comment.