aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-08-01 21:56:38 +0000
committerJonas Gorski <jogo@openwrt.org>2014-08-01 21:56:38 +0000
commit76746026b336fe34b9a4da5f4b8d53547d95a11c (patch)
treeb80fd8f3d59b4cc7784a8e1e01ce375d5ef4a0b0 /target/linux/brcm63xx/patches-3.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
parentfaa51b307cfdbec28f474b48699358064e0f99c7 (diff)
downloadupstream-76746026b336fe34b9a4da5f4b8d53547d95a11c.tar.gz
upstream-76746026b336fe34b9a4da5f4b8d53547d95a11c.tar.bz2
upstream-76746026b336fe34b9a4da5f4b8d53547d95a11c.zip
brcm63xx: rework fallback sprom support
Rework fallback sprom support by providing different sproms for different chips. Also make it optional to use. This likely causes sprom fallback support to break on a few boards. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 41942
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch b/target/linux/brcm63xx/patches-3.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
index a511af03af..7a3d8cfed2 100644
--- a/target/linux/brcm63xx/patches-3.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
+++ b/target/linux/brcm63xx/patches-3.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
@@ -21,8 +21,8 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
-- pci-ath9k-fixup.o usb-common.o
-+ pci-ath9k-fixup.o pci-rt2x00-fixup.o usb-common.o
+- pci-ath9k-fixup.o usb-common.o sprom.o
++ pci-ath9k-fixup.o pci-rt2x00-fixup.o usb-common.o sprom.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-y += boards/
@@ -36,7 +36,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
#include "board_common.h"
-@@ -293,9 +294,19 @@ int __init board_register_devices(void)
+@@ -250,9 +251,19 @@ int __init board_register_devices(void)
}
/* register any fixups */
@@ -158,15 +158,15 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -9,6 +9,7 @@
- #include <bcm63xx_dev_usb_usbd.h>
+@@ -10,6 +10,7 @@
#include <bcm63xx_dev_dsp.h>
+ #include <bcm63xx_fallback_sprom.h>
#include <pci_ath9k_fixup.h>
+#include <pci_rt2x00_fixup.h>
/*
* flash mapping
-@@ -16,11 +17,15 @@
+@@ -17,11 +18,15 @@
#define BCM963XX_CFE_VERSION_OFFSET 0x570
#define BCM963XX_NVRAM_OFFSET 0x580
@@ -183,7 +183,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
};
/*
-@@ -45,7 +50,7 @@ struct board_info {
+@@ -47,7 +52,7 @@ struct board_info {
unsigned int has_caldata:2;
/* wifi calibration data config */