bcm63xx: update patches to latest upstream versions

[openwrt/staging/wigyori.git] / target / linux / brcm63xx / patches-3.3 / 511-board_V2500V.patch

diff --git a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
index 419f3a0ae329dfd8ed2c835cdf8678be8ee9f99d..6fca36f2a1acbbbcb1e9fee23137a2bef0696dc2 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
@@ -25,27 +25,27 @@
 +
 +      .leds = {
 +              {
-+                      .name           = "power:green",
++                      .name           = "V2500V_BB:green:power",
 +                      .gpio           = 0,
 +                      .active_low     = 1,
 +                      .default_trigger = "default-on",
 +              },
 +              {
-+                      .name           = "power:red",
++                      .name           = "V2500V_BB:red:power",
 +                      .gpio           = 1,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "adsl",
++                      .name           = "V2500V_BB:green:adsl",
 +                      .gpio           = 2,
 +                      .active_low     = 1,
 +              },
-+              {       .name           = "ppp",
++              {       .name           = "V2500V_BB:green:ppp",
 +                      .gpio           = 3,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "wireless",
++                      .name           = "V2500V_BB:green:wireless",
 +                      .gpio           = 6,
 +                      .active_low     = 1,
 +              },
@@ -64,7 +64,7 @@
  #endif
  
  /*
-@@ -1785,6 +1842,7 @@ static const struct board_info __initdat
+@@ -1782,6 +1839,7 @@ static const struct board_info __initdat
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -72,7 +72,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1911,6 +1969,23 @@ void __init board_prom_init(void)
+@@ -1909,6 +1967,23 @@ void __init board_prom_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);
@@ -98,7 +98,7 @@
        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
 --- a/arch/mips/bcm63xx/dev-flash.c
 +++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -18,6 +18,7 @@
+@@ -19,6 +19,7 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/flash.h>
  
@@ -106,7 +106,7 @@
  #include <bcm63xx_cpu.h>
  #include <bcm63xx_dev_flash.h>
  #include <bcm63xx_dev_hsspi.h>
-@@ -145,6 +146,13 @@ int __init bcm63xx_flash_register(int nu
+@@ -150,6 +151,13 @@ int __init bcm63xx_flash_register(int nu
                val = bcm_mpi_readl(MPI_CSBASE_REG(0));
                val &= MPI_CSBASE_BASE_MASK;