apm821xx: WNDR4700: enumerate PCIe in device-tree

[openwrt/openwrt.git] / target / linux / apm821xx / base-files / etc / hotplug.d / firmware / 10-ath9k-eeprom

diff --git a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index 07100b1856c042317c990eb1718d1dc93c56fcb5..dcdcf4dc453f264f5f9182b3eaf4b3258bfca14a 100644 (file)
--- a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -4,27 +4,19 @@
 
 . /lib/functions/caldata.sh
 
-ath9k_patch_firmware_mac() {
-       local mac=$1
-
-       [ -z "$mac" ] && return
-
-       macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=2 count=6
-}
-
 board=$(board_name)
 
 case "$FIRMWARE" in
-"pci_wmac0.eeprom")
-       case $board in
-       netgear,wndr4700)
+"ath9k-eeprom-pci-0000:43:00.0.bin")
+        case $board in
+        netgear,wndr4700)
                . /lib/upgrade/nand.sh
 
                if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
-                       caldata_extract_ubi "caldata" 0x5000 0x1000
+                       caldata_extract_ubi "caldata" 0x1000 0x1000
                else
-                       caldata_extract "wifi_data" 0x5000 0x1000
-                       ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0xc)
+                       caldata_extract "wifi_data" 0x1000 0x1000
+                       ath9k_patch_mac $(mtd_get_mac_binary wifi_data 0x0)
                fi
                ;;
        *)
@@ -33,16 +25,16 @@ case "$FIRMWARE" in
        esac
        ;;
 
-"pci_wmac1.eeprom")
-       case $board in
-       netgear,wndr4700)
+"ath9k-eeprom-pci-0000:44:00.0.bin")
+        case $board in
+        netgear,wndr4700)
                . /lib/upgrade/nand.sh
 
                if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
-                       caldata_extract_ubi "caldata" 0x1000 0x1000
+                       caldata_extract_ubi "caldata" 0x5000 0x1000
                else
-                       caldata_extract "wifi_data" 0x1000 0x1000
-                       ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0x0)
+                       caldata_extract "wifi_data" 0x5000 0x1000
+                       ath9k_patch_mac $(mtd_get_mac_binary wifi_data 0xc)
                fi
                ;;
        *)