aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/base-files
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2020-08-12 01:21:13 +0200
committerChristian Lamparter <chunkeey@gmail.com>2020-08-29 17:14:27 +0200
commit2c3f16d70e32d7b5eb62096097c4343c5409afe3 (patch)
tree47c8e42364eef32d22d15081234f805f04ae303e /target/linux/apm821xx/base-files
parentd75e75306301852a848824cf268d8b58eda28a8a (diff)
downloadupstream-2c3f16d70e32d7b5eb62096097c4343c5409afe3.tar.gz
upstream-2c3f16d70e32d7b5eb62096097c4343c5409afe3.tar.bz2
upstream-2c3f16d70e32d7b5eb62096097c4343c5409afe3.zip
apm821xx: WNDR4700: enumerate PCIe in device-tree
This patch adds the pcie-switch and bridge configuration of the WNDR4700. This allows to get rid of the legacy firmware monikers and drop the usbport LED declaration. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'target/linux/apm821xx/base-files')
-rwxr-xr-xtarget/linux/apm821xx/base-files/etc/board.d/01_leds3
-rw-r--r--target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom24
2 files changed, 12 insertions, 15 deletions
diff --git a/target/linux/apm821xx/base-files/etc/board.d/01_leds b/target/linux/apm821xx/base-files/etc/board.d/01_leds
index dd529b528d..57598c0ca9 100755
--- a/target/linux/apm821xx/base-files/etc/board.d/01_leds
+++ b/target/linux/apm821xx/base-files/etc/board.d/01_leds
@@ -42,9 +42,6 @@ netgear,wndap660)
netgear,wndr4700)
ucidef_set_led_switch "wan_green" "WAN (green)" "wndr4700:green:wan" "switch0" "0x20"
ucidef_set_led_netdev "wan_yellow" "WAN (yellow)" "wndr4700:yellow:wan" "eth0.2" "tx rx"
- ucidef_set_led_usbport "usb3" "USB3" "wndr4700:blue:usb" "usb2-port1" "usb2-port2" "usb3-port1" "usb3-port2"
- ucidef_set_led_wlan "wlan2g" "WLAN2G" "wndr4700:blue:wlan" "phy0tpt"
- ucidef_set_led_wlan "wlan5g" "WLAN5G" "wndr4700:blue:wlan" "phy1tpt"
;;
*)
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 ee58901d18..dcdcf4dc45 100644
--- 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
@@ -7,16 +7,16 @@
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_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
;;
*)
@@ -25,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_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
;;
*)