ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-18 18:56:37 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

ath79: calibrate dlink dir-825 b1 with nvmem

Browse Source 
Driver for both soc (2.4GHz Wifi) and pci (5 GHz) now pull the calibration
data from the nvmem subsystem.

This allows us to move the userspace caldata extraction for the pci-e ath9k
supported wifi into the device-tree definition of the device.

Currently, only ethernet devices uses the mac address of
"mac-address-ascii" cells, while PCI ath9k devices uses the mac address
within calibration data.

Signed-off-by: Edward Chow <equu@openmail.cc>
(restored switch configuration in 02_network, integrated caldata into
partition)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Edward Chow 2022-11-20 13:49:45 +08:00 committed by Christian Lamparter
parent c2d1c32d1e
commit de3d60b982
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
View File

@ -139,7 +139,8 @@
ath9k0: wifi@0,11 {
compatible = "pci168c,0029";
reg = <0x8800 0 0 0 0>;
qca,no-eeprom;
nvmem-cells = <&macaddr_lan>, <&cal_art_1000>;
nvmem-cell-names = "mac-address-ascii", "calibration";
#gpio-cells = <2>;
gpio-controller;
};
@ -147,7 +148,9 @@
ath9k1: wifi@0,12 {
compatible = "pci168c,0029";
reg = <0x9000 0 0 0 0>;
qca,no-eeprom;
nvmem-cells = <&macaddr_wan>, <&cal_art_5000>;
nvmem-cell-names = "mac-address-ascii", "calibration";
mac-address-increment = <1>;
#gpio-cells = <2>;
gpio-controller;
};
@ -184,9 +187,28 @@
};
partition@660000 {
compatible = "nvmem-cells";
label = "caldata";
reg = <0x660000 0x010000>;
read-only;
#address-cells = <1>;
#size-cells = <1>;
cal_art_1000: cal@1000 {
reg = <0x1000 0xeb8>;
};
cal_art_5000: cal@5000 {
reg = <0x5000 0xeb8>;
};
macaddr_lan: macaddr@ffa0 {
reg = <0xffa0 0x11>;
};
macaddr_wan: macaddr@ffb4 {
reg = <0xffb4 0x11>;
};
};
fwconcat1: partition@670000 {
@ -202,6 +224,9 @@
pll-data = <0x11110000 0x00001099 0x00991099>;
nvmem-cells = <&macaddr_lan>;
nvmem-cell-names = "mac-address-ascii";
fixed-link {
speed = <1000>;
full-duplex;
@ -213,5 +238,9 @@
pll-data = <0x11110000 0x00001099 0x00991099>;
nvmem-cells = <&macaddr_wan>;
nvmem-cell-names = "mac-address-ascii";
phy-handle = <&phy4>;
};

1
target/linux/ath79/generic/base-files/etc/board.d/02_network
View File

@ -634,7 +634,6 @@ ath79_setup_macs()
dlink,dir-629-a1)
wan_mac=$(mtd_get_mac_text "mfcdata" 0x6a)
;;
dlink,dir-825-b1|\
trendnet,tew-673gru)
lan_mac=$(mtd_get_mac_text "caldata" 0xffa0)
wan_mac=$(mtd_get_mac_text "caldata" 0xffb4)

2
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View File

@ -124,7 +124,6 @@ case "$FIRMWARE" in
buffalo,wzr-hp-ag300h)
caldata_extract "art" 0x1000 0xeb8
;;
dlink,dir-825-b1|\
trendnet,tew-673gru)
caldata_extract "caldata" 0x1000 0xeb8
ath9k_patch_mac_crc $(mtd_get_mac_text "caldata" 0xffa0) 0x20c
@ -143,7 +142,6 @@ case "$FIRMWARE" in
buffalo,wzr-hp-ag300h)
caldata_extract "art" 0x5000 0xeb8
;;
dlink,dir-825-b1|\
trendnet,tew-673gru)
caldata_extract "caldata" 0x5000 0xeb8
ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_text "caldata" 0xffb4) 1) 0x20c