ipq806x: consolidate 11-ath10k-caldata

After the ath10k_patch_mac lines have been removed, a lot of blocks
can be consolidated.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

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 c8924df92f6cfa6f4a5f6c5fab0b3d21aeca508b..87c479455226bc11ddac65389fd2c5c14c4dbf3b 100644 (file)
--- 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
@@ -12,29 +12,24 @@ case "$FIRMWARE" in
        askey,rt4230w-rev6)
                caldata_extract "0:ART" 0x1000 0x2f20
                ;;
-       asrock,g10)
+       asrock,g10 |\
+       edgecore,ecw5410)
                caldata_extract "0:art" 0x1000 0x2f20
                ;;
-       buffalo,wxr-2533dhp)
+       buffalo,wxr-2533dhp |\
+       nec,wg2600hp |\
+       nec,wg2600hp3 |\
+       tplink,vr2600v)
                caldata_extract "ART" 0x1000 0x2f20
                ;;
-       edgecore,ecw5410)
-               caldata_extract "0:art" 0x1000 0x2f20
-               ;;
        linksys,ea7500-v1 |\
        linksys,ea8500)
                caldata_extract "art" 0x1000 0x2f20
                ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) 1)
                ;;
-       nec,wg2600hp |\
-       nec,wg2600hp3)
-               caldata_extract "ART" 0x1000 0x2f20
-               ;;
        netgear,d7800 |\
        netgear,r7500v2 |\
-       netgear,r7800)
-               caldata_extract "art" 0x1000 0x2f20
-               ;;
+       netgear,r7800 |\
        netgear,xr500)
                caldata_extract "art" 0x1000 0x2f20
                ;;
@@ -42,9 +37,6 @@ case "$FIRMWARE" in
        tplink,c2600)
                caldata_extract "radio" 0x1000 0x2f20
                ;;
-       tplink,vr2600v)
-               caldata_extract "ART" 0x1000 0x2f20
-               ;;
        zyxel,nbg6817)
                caldata_extract "0:art" 0x1000 0x2f20
                ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) 1)
@@ -59,7 +51,10 @@ case "$FIRMWARE" in
        asrock,g10)
                caldata_extract "0:art" 0x5000 0x2f20
                ;;
-       buffalo,wxr-2533dhp)
+       buffalo,wxr-2533dhp |\
+       nec,wg2600hp |\
+       nec,wg2600hp3 |\
+       tplink,vr2600v)
                caldata_extract "ART" 0x5000 0x2f20
                ;;
        linksys,ea7500-v1 |\
@@ -67,15 +62,9 @@ case "$FIRMWARE" in
                caldata_extract "art" 0x5000 0x2f20
                ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) 2)
                ;;
-       nec,wg2600hp |\
-       nec,wg2600hp3)
-               caldata_extract "ART" 0x5000 0x2f20
-               ;;
        netgear,d7800 |\
        netgear,r7500v2 |\
-       netgear,r7800)
-               caldata_extract "art" 0x5000 0x2f20
-               ;;
+       netgear,r7800 |\
        netgear,xr500)
                caldata_extract "art" 0x5000 0x2f20
                ;;
@@ -83,9 +72,6 @@ case "$FIRMWARE" in
        tplink,c2600)
                caldata_extract "radio" 0x5000 0x2f20
                ;;
-       tplink,vr2600v)
-               caldata_extract "ART" 0x5000 0x2f20
-               ;;
        zyxel,nbg6817)
                caldata_extract "0:art" 0x5000 0x2f20
                ath10k_patch_mac $(mtd_get_mac_ascii 0:appsblenv ethaddr)