ath79: D-Link DAP-2660 A1: convert ath10k caldata to nvmem
Add the PCIe node for the ath10k radio to the devicetree, and refer to the art partition for the calibration data using nvmem-cells. MAC address assignment is moved to '10_fix_wifi_mac', so the device can then be removed from the caldata extraction script '11-ath10k-caldata'. Cc: Sebastian Schaper <openwrt@sebastianschaper.net> Tested-by: Sebastian Schaper <openwrt@sebastianschaper.net> Signed-off-by: Sander Vanheule <sander@svanheule.net>
This commit is contained in:
		@@ -79,4 +79,18 @@
 | 
			
		||||
 | 
			
		||||
&pcie0 {
 | 
			
		||||
	status = "okay";
 | 
			
		||||
 | 
			
		||||
	wifi@0,0 {
 | 
			
		||||
		compatible = "qcom,ath10k";
 | 
			
		||||
		reg = <0 0 0 0 0>;
 | 
			
		||||
 | 
			
		||||
		nvmem-cells = <&cal_ath10k>;
 | 
			
		||||
		nvmem-cell-names = "calibration";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&art {
 | 
			
		||||
	cal_ath10k: calibration@5000 {
 | 
			
		||||
		reg = <0x5000 0x844>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
@@ -67,7 +67,6 @@ case "$FIRMWARE" in
 | 
			
		||||
		caldata_extract "art" 0x5000 0x844
 | 
			
		||||
		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) -1)
 | 
			
		||||
		;;
 | 
			
		||||
	dlink,dap-2660-a1|\
 | 
			
		||||
	dlink,dap-2695-a1|\
 | 
			
		||||
	dlink,dap-3662-a1)
 | 
			
		||||
		caldata_extract "art" 0x5000 0x844
 | 
			
		||||
 
 | 
			
		||||
@@ -26,12 +26,12 @@ case "$board" in
 | 
			
		||||
	dlink,dap-3320-a1)
 | 
			
		||||
		mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
 | 
			
		||||
		;;
 | 
			
		||||
	dlink,dap-2660-a1|\
 | 
			
		||||
	dlink,dap-2695-a1|\
 | 
			
		||||
	dlink,dap-3662-a1)
 | 
			
		||||
		[ "$PHYNBR" -eq 1 ] && \
 | 
			
		||||
			mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
 | 
			
		||||
		;;
 | 
			
		||||
	dlink,dap-2660-a1|\
 | 
			
		||||
	dlink,dap-2680-a1)
 | 
			
		||||
		[ "$PHYNBR" -eq 0 ] && \
 | 
			
		||||
			mtd_get_mac_ascii bdcfg "wlanmac_a" > /sys${DEVPATH}/macaddress
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user