From 33f09cf15178cf7e05cbe816e1cb492bcae89836 Mon Sep 17 00:00:00 2001
From: Luis Araneda <luaraneda@gmail.com>
Date: Fri, 5 Jan 2018 10:00:11 -0300
Subject: ipq806x: convert to dt-based board-detection

Use the generic board detection method:
- Board name: First compatible string from the device tree
- Board model: Model property from the device tree

Change occurrences of board name in userspace by the compatible
string, and removed target specific board detection script

Replace the definition of SUPPORTED_DEVICES in Device/Default
to extract the dt compatible string from each device definition.
Additionally, for devices supported by lede-17.01, append
the value of BOARD_NAME to SUPPORTED_DEVICES in the device
definition.

Signed-off-by: Luis Araneda <luaraneda@gmail.com>
---
 .../etc/hotplug.d/firmware/11-ath10k-caldata       | 36 +++++++++++-----------
 .../etc/hotplug.d/ieee80211/10_fix_wifi_mac        | 14 ++++-----
 2 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'target/linux/ipq806x/base-files/etc/hotplug.d')

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 4c5b55bc53..dc74df87cc 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
@@ -47,20 +47,20 @@ board=$(board_name)
 case "$FIRMWARE" in
 "ath10k/pre-cal-ahb-a000000.wifi.bin")
 	case "$board" in
-	ap-dk01.1-c1)
+	qcom,ap-dk01.1-c1)
 		ath10kcal_extract "ART" 4096 12064
 		;;
-	fritz4040)
+	avm,fritzbox-4040)
 		/usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config")
 		;;
 	esac
 	;;
 "ath10k/pre-cal-ahb-a800000.wifi.bin")
 	case "$board" in
-	ap-dk01.1-c1)
+	qcom,ap-dk01.1-c1)
 		ath10kcal_extract "ART" 20480 12064
 		;;
-	fritz4040)
+	avm,fritzbox-4040)
 		/usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config")
 		;;
 	esac
@@ -68,46 +68,46 @@ case "$FIRMWARE" in
 
 "ath10k/pre-cal-pci-0000:01:00.0.bin")
 	case $board in
-	c2600)
+	tplink,c2600)
 		ath10kcal_extract "radio" 4096 12064
 # 		ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -1)
 		;;
-	d7800 |\
-	r7500v2 |\
-	r7800)
+	netgear,d7800 |\
+	netgear,r7500v2 |\
+	netgear,r7800)
 		ath10kcal_extract "art" 4096 12064
 		;;
-	ea8500)
+	linksys,ea8500)
 		hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
 		ath10kcal_extract "art" 4096 12064
 		;;
-	nbg6817)
+	zyxel,nbg6817)
 		ath10kcal_extract "0:ART" 4096 12064
 		;;
-	vr2600v)
+	tplink,vr2600v)
 		ath10kcal_extract "ART" 4096 12064
 		;;
 	esac
 	;;
 "ath10k/pre-cal-pci-0001:01:00.0.bin")
 	case $board in
-	c2600)
+	tplink,c2600)
 		ath10kcal_extract "radio" 20480 12064
 # 		ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -2)
 		;;
-	d7800 |\
-	r7500v2 |\
-	r7800)
+	netgear,d7800 |\
+	netgear,r7500v2 |\
+	netgear,r7800)
 		ath10kcal_extract "art" 20480 12064
 		;;
-	ea8500)
+	linksys,ea8500)
 		hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
 		ath10kcal_extract "art" 20480 12064
 		;;
-	nbg6817)
+	zyxel,nbg6817)
 		ath10kcal_extract "0:ART" 20480 12064
 		;;
-	vr2600v)
+	tplink,vr2600v)
 		ath10kcal_extract "ART" 20480 12064
 		;;
 	esac
diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
index 7884f5117a..207711063c 100644
--- a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -12,21 +12,21 @@ PHYNBR=${DEVPATH##*/phy}
 board=$(board_name)
 
 case "$board" in
-	c2600)
+	tplink,c2600)
 		echo $(macaddr_add $(mtd_get_mac_binary default-mac 8)  $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
 		;;
-	d7800 |\
-	r7500v2 |\
-	r7800)
+	netgear,d7800 |\
+	netgear,r7500v2 |\
+	netgear,r7800)
 		echo $(macaddr_add $(mtd_get_mac_binary art 6)  $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress
 		;;
-	ea8500)
+	linksys,ea8500)
 		echo $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress
 		;;
-	nbg6817)
+	zyxel,nbg6817)
 		echo $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) $((1 - $PHYNBR)) ) > /sys${DEVPATH}/macaddress
 		;;
-	vr2600v)
+	tplink,vr2600v)
 		echo $(macaddr_add $(mtd_get_mac_binary default-mac 0)  $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
 		;;
 	*)
-- 
cgit v1.2.3