mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-20 06:50:43 +03:00
374bb82f67
If there is no sprom on an ssb based pci device on the brcm47xx architecture ssb now asks the architecture code to look into the nvram to get some sprom data for this device. Now we are able to read out pci/1/1/ foo or pci/1/3/ foo config options. This will fix some problems where the wireless devices does not got an mac address and the following message was show: ssb: WARNING: Invalid SPROM CRC (corrupt SPROM) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26801 3c298f89-4303-0410-b956-a3cf2f4a3e73
49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
--- a/arch/mips/bcm47xx/nvram.c
|
|
+++ b/arch/mips/bcm47xx/nvram.c
|
|
@@ -23,7 +23,7 @@
|
|
static char nvram_buf[NVRAM_SPACE];
|
|
|
|
/* Probe for NVRAM header */
|
|
-static void __init early_nvram_init(void)
|
|
+static void early_nvram_init(void)
|
|
{
|
|
struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
|
|
struct nvram_header *header;
|
|
--- a/arch/mips/bcm47xx/setup.c
|
|
+++ b/arch/mips/bcm47xx/setup.c
|
|
@@ -156,6 +156,22 @@ static void bcm47xx_fill_sprom(struct ss
|
|
}
|
|
}
|
|
|
|
+int bcm47xx_get_sprom(struct ssb_bus *bus)
|
|
+{
|
|
+ char prefix[10];
|
|
+
|
|
+ if (bus->bustype == SSB_BUSTYPE_PCI) {
|
|
+ snprintf(prefix, sizeof(prefix), "pci/%x/%x/",
|
|
+ bus->host_pci->bus->number + 1,
|
|
+ PCI_SLOT(bus->host_pci->devfn));
|
|
+ bcm47xx_fill_sprom(&bus->sprom, prefix);
|
|
+ return 0;
|
|
+ } else {
|
|
+ printk(KERN_WARNING "bcm47xx: unable to fill SPROM for given bustype.\n");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+}
|
|
+
|
|
static int bcm47xx_get_invariants(struct ssb_bus *bus,
|
|
struct ssb_init_invariants *iv)
|
|
{
|
|
@@ -212,6 +228,11 @@ void __init plat_mem_setup(void)
|
|
char buf[100];
|
|
struct ssb_mipscore *mcore;
|
|
|
|
+ err = ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom);
|
|
+ if (err)
|
|
+ printk(KERN_WARNING "bcm47xx: someone else already registered"
|
|
+ " a ssb SPROM callback handler (err %d)\n", err);
|
|
+
|
|
err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
|
|
bcm47xx_get_invariants);
|
|
if (err)
|