ar71xx: use modules for LED triggers

[openwrt.git] / target / linux / brcm47xx / patches-3.2 / 231-bcma_reorder_sprom_fill.patch

diff --git a/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch b/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch
index c991ed3..075f7be 100644 (file)
--- a/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch
+++ b/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c

-@@ -96,6 +96,7 @@ static int bcm47xx_get_sprom_ssb(struct
+@@ -98,6 +98,7 @@ static int bcm47xx_get_sprom_ssb(struct

        char prefix[10];
  
        if (bus->bustype == SSB_BUSTYPE_PCI) {
        char prefix[10];
  
        if (bus->bustype == SSB_BUSTYPE_PCI) {


@@ -8,7 +8,7 @@
                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
                         bus->host_pci->bus->number + 1,
                         PCI_SLOT(bus->host_pci->devfn));
                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
                         bus->host_pci->bus->number + 1,
                         PCI_SLOT(bus->host_pci->devfn));

-@@ -124,6 +125,7 @@ static int bcm47xx_get_invariants(struct
+@@ -126,6 +127,7 @@ static int bcm47xx_get_invariants(struct

        if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
                iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
  
        if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
                iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
  


@@ -16,17 +16,17 @@
        bcm47xx_fill_sprom(&iv->sprom, NULL);
  
        if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
        bcm47xx_fill_sprom(&iv->sprom, NULL);
  
        if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)

-@@ -203,12 +205,14 @@ static int bcm47xx_get_sprom_bcma(struct
-       struct bcma_device *core;
+@@ -206,12 +208,14 @@ static int bcm47xx_get_sprom_bcma(struct

  
  

-       if (bus->hosttype == BCMA_HOSTTYPE_PCI) {
+       switch (bus->hosttype) {
+       case BCMA_HOSTTYPE_PCI:

 +              memset(out, 0, sizeof(struct ssb_sprom));
                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
                         bus->host_pci->bus->number + 1,
                         PCI_SLOT(bus->host_pci->devfn));
                bcm47xx_fill_sprom(out, prefix);
                return 0;
 +              memset(out, 0, sizeof(struct ssb_sprom));
                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
                         bus->host_pci->bus->number + 1,
                         PCI_SLOT(bus->host_pci->devfn));
                bcm47xx_fill_sprom(out, prefix);
                return 0;

-       } else if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
+       case BCMA_HOSTTYPE_SOC:

 +              memset(out, 0, sizeof(struct ssb_sprom));
                bcm47xx_fill_sprom_ethernet(out, NULL);
                core = bcma_find_core(bus, BCMA_CORE_80211);
 +              memset(out, 0, sizeof(struct ssb_sprom));
                bcm47xx_fill_sprom_ethernet(out, NULL);
                core = bcma_find_core(bus, BCMA_CORE_80211);