KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bcm53xx: update bcm47xx_sprom to the latest 4.6 queued version

Browse source 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 48963
This commit is contained in:
Rafał Miłecki 2016-03-08 11:05:10 +00:00
parent 81edbe39b8
commit baf0b18653
3 changed files with 6 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c
View file

@ -601,7 +601,7 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
bcm47xx_sprom_fill_auto(sprom, prefix, fallback); bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
} }
#if defined(CONFIG_SSB_SPROM) #if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM)
static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out) static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
{ {
char prefix[10]; char prefix[10];
@ -624,7 +624,7 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
} }
#endif #endif
#if defined(CONFIG_BCMA) #if IS_BUILTIN(CONFIG_BCMA)
/* /*
* Having many NVRAM entries for PCI devices led to repeating prefixes like * Having many NVRAM entries for PCI devices led to repeating prefixes like
* pci/1/1/ all the time and wasting flash space. So at some point Broadcom * pci/1/1/ all the time and wasting flash space. So at some point Broadcom
@ -719,14 +719,14 @@ int bcm47xx_sprom_register_fallbacks(void)
if (bcm47xx_sprom_registered) if (bcm47xx_sprom_registered)
return 0; return 0;
#if defined(CONFIG_SSB_SPROM) #if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM)
if (ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb)) if (ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb))
pr_warn("Failed to registered ssb SPROM handler\n"); pr_warn("Failed to register ssb SPROM handler\n");
#endif #endif
#if defined(CONFIG_BCMA) #if IS_BUILTIN(CONFIG_BCMA)
if (bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma)) if (bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma))
pr_warn("Failed to registered bcma SPROM handler\n"); pr_warn("Failed to register bcma SPROM handler\n");
#endif #endif
bcm47xx_sprom_registered = 1; bcm47xx_sprom_registered = 1;

49
target/linux/bcm53xx/patches-4.1/113-bcm47xx_sprom-Fix-compilation-with-ssb-bcma-as-modul.patch
View file

@ -1,49 +0,0 @@
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Tue, 8 Mar 2016 07:52:18 +0100
Subject: [PATCH] bcm47xx_sprom: Fix compilation with ssb/bcma as module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It was failing due to unknown ssb_arch_register_fallback_sprom or
bcma_arch_register_fallback_sprom with CONFIG_SSB=m or CONFIG_BCMA=m
Fixes: e8a46c88b516 ("MIPS: BCM47xx: Move SPROM driver to drivers/firmware/¨)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
--- a/drivers/firmware/broadcom/bcm47xx_sprom.c
+++ b/drivers/firmware/broadcom/bcm47xx_sprom.c
@@ -601,7 +601,7 @@ void bcm47xx_fill_sprom(struct ssb_sprom
bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
}
-#if defined(CONFIG_SSB_SPROM)
+#if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM)
static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
{
char prefix[10];
@@ -624,7 +624,7 @@ static int bcm47xx_get_sprom_ssb(struct
}
#endif
-#if defined(CONFIG_BCMA)
+#if IS_BUILTIN(CONFIG_BCMA)
/*
* Having many NVRAM entries for PCI devices led to repeating prefixes like
* pci/1/1/ all the time and wasting flash space. So at some point Broadcom
@@ -719,12 +719,12 @@ int bcm47xx_sprom_register_fallbacks(voi
if (bcm47xx_sprom_registered)
return 0;
-#if defined(CONFIG_SSB_SPROM)
+#if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM)
if (ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb))
pr_warn("Failed to registered ssb SPROM handler\n");
#endif
-#if defined(CONFIG_BCMA)
+#if IS_BUILTIN(CONFIG_BCMA)
if (bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma))
pr_warn("Failed to registered bcma SPROM handler\n");
#endif

49
target/linux/bcm53xx/patches-4.4/113-bcm47xx_sprom-Fix-compilation-with-ssb-bcma-as-modul.patch
View file

@ -1,49 +0,0 @@
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Tue, 8 Mar 2016 07:52:18 +0100
Subject: [PATCH] bcm47xx_sprom: Fix compilation with ssb/bcma as module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It was failing due to unknown ssb_arch_register_fallback_sprom or
bcma_arch_register_fallback_sprom with CONFIG_SSB=m or CONFIG_BCMA=m
Fixes: e8a46c88b516 ("MIPS: BCM47xx: Move SPROM driver to drivers/firmware/¨)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
--- a/drivers/firmware/broadcom/bcm47xx_sprom.c
+++ b/drivers/firmware/broadcom/bcm47xx_sprom.c
@@ -601,7 +601,7 @@ void bcm47xx_fill_sprom(struct ssb_sprom
bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
}
-#if defined(CONFIG_SSB_SPROM)
+#if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM)
static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
{
char prefix[10];
@@ -624,7 +624,7 @@ static int bcm47xx_get_sprom_ssb(struct
}
#endif
-#if defined(CONFIG_BCMA)
+#if IS_BUILTIN(CONFIG_BCMA)
/*
* Having many NVRAM entries for PCI devices led to repeating prefixes like
* pci/1/1/ all the time and wasting flash space. So at some point Broadcom
@@ -719,12 +719,12 @@ int bcm47xx_sprom_register_fallbacks(voi
if (bcm47xx_sprom_registered)
return 0;
-#if defined(CONFIG_SSB_SPROM)
+#if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM)
if (ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb))
pr_warn("Failed to registered ssb SPROM handler\n");
#endif
-#if defined(CONFIG_BCMA)
+#if IS_BUILTIN(CONFIG_BCMA)
if (bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma))
pr_warn("Failed to registered bcma SPROM handler\n");
#endif