aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.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
commit09031707583e2bd979b488d27f50d719af1278bf (patch)
tree9467e1f79d674b203b8abac4bb4b14d908a5a50c /target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch
parent6354265168e5c7b593c6579c3a211cd94e914f94 (diff)
downloadmaster-187ad058-09031707583e2bd979b488d27f50d719af1278bf.tar.gz
master-187ad058-09031707583e2bd979b488d27f50d719af1278bf.tar.bz2
master-187ad058-09031707583e2bd979b488d27f50d719af1278bf.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41942 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch41
1 files changed, 17 insertions, 24 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch
index 1e75cfe0d6..4acf40d627 100644
--- a/target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch
@@ -1,27 +1,20 @@
---- a/arch/mips/bcm63xx/boards/board_common.c
-+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -13,6 +13,7 @@
- #include <linux/platform_device.h>
- #include <linux/ssb/ssb.h>
- #include <linux/gpio_keys.h>
-+#include <linux/export.h>
- #include <linux/spi/spi.h>
- #include <asm/addrspace.h>
- #include <asm/bootinfo.h>
-@@ -49,7 +50,7 @@ static struct board_info board;
- * bcm4318 WLAN work
+--- a/arch/mips/bcm63xx/sprom.c
++++ b/arch/mips/bcm63xx/sprom.c
+@@ -8,6 +8,7 @@
*/
- #ifdef CONFIG_SSB_PCIHOST
--static struct ssb_sprom bcm63xx_sprom = {
-+struct ssb_sprom bcm63xx_sprom = {
- .revision = 0x02,
- .board_rev = 0x17,
- .country_code = 0x0,
-@@ -69,6 +70,7 @@ static struct ssb_sprom bcm63xx_sprom =
- .boardflags_lo = 0x2848,
- .boardflags_hi = 0x0000,
+
+ #include <linux/init.h>
++#include <linux/export.h>
+ #include <linux/kernel.h>
+ #include <linux/string.h>
+ #include <linux/platform_device.h>
+@@ -387,7 +388,8 @@ struct fallback_sprom_match {
+ struct ssb_sprom sprom;
};
-+EXPORT_SYMBOL(bcm63xx_sprom);
- int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
- {
+-static struct fallback_sprom_match fallback_sprom;
++struct fallback_sprom_match fallback_sprom;
++EXPORT_SYMBOL(fallback_sprom);
+
+ #if defined(CONFIG_SSB_PCIHOST)
+ int bcm63xx_get_fallback_ssb_sprom(struct ssb_bus *bus, struct ssb_sprom *out)