X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=target%2Flinux%2Fipq806x%2Fbase-files%2Fetc%2Fhotplug.d%2Ffirmware%2F11-ath10k-caldata;fp=target%2Flinux%2Fipq806x%2Fbase-files%2Fetc%2Fhotplug.d%2Ffirmware%2F11-ath10k-caldata;h=c8924df92f6cfa6f4a5f6c5fab0b3d21aeca508b;hp=2746ef1e2a70052df8bf32dd1fe77daf08ba5303;hb=6a27e8036e63f2477333c324ae41f038e9ac6297;hpb=f44e933458b13ab99c76dac840908104814442c8

diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 2746ef1e2a..c8924df92f 100644
--- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -13,23 +13,13 @@ case "$FIRMWARE" in
 		caldata_extract "0:ART" 0x1000 0x2f20
 		;;
 	asrock,g10)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x1000 0x2f20
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x1000 0x2f20
-		fi
+		caldata_extract "0:art" 0x1000 0x2f20
 		;;
 	buffalo,wxr-2533dhp)
 		caldata_extract "ART" 0x1000 0x2f20
 		;;
 	edgecore,ecw5410)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x1000 0x2f20
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x1000 0x2f20
-		fi
+		caldata_extract "0:art" 0x1000 0x2f20
 		;;
 	linksys,ea7500-v1 |\
 	linksys,ea8500)
@@ -56,14 +46,8 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x1000 0x2f20
 		;;
 	zyxel,nbg6817)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x1000 0x2f20
-			ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) 1)
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x1000 0x2f20
-			ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) 1)
-		fi
+		caldata_extract "0:art" 0x1000 0x2f20
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) 1)
 		;;
 	esac
 	;;
@@ -73,12 +57,7 @@ case "$FIRMWARE" in
 		caldata_extract "0:ART" 0x5000 0x2f20
 		;;
 	asrock,g10)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x5000 0x2f20
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x5000 0x2f20
-		fi
+		caldata_extract "0:art" 0x5000 0x2f20
 		;;
 	buffalo,wxr-2533dhp)
 		caldata_extract "ART" 0x5000 0x2f20
@@ -108,26 +87,15 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		;;
 	zyxel,nbg6817)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x5000 0x2f20
-			ath10k_patch_mac $(mtd_get_mac_ascii 0:appsblenv ethaddr)
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x5000 0x2f20
-			ath10k_patch_mac $(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
-		fi
+		caldata_extract "0:art" 0x5000 0x2f20
+		ath10k_patch_mac $(mtd_get_mac_ascii 0:appsblenv ethaddr)
 		;;
 	esac
 	;;
 "ath10k/pre-cal-pci-0002:01:00.0.bin")
 	case $board in
 	edgecore,ecw5410)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x5000 0x2f20
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x5000 0x2f20
-		fi
+		caldata_extract "0:art" 0x5000 0x2f20
 		;;
 	esac
 	;;