[brcm63xx] fix leds naming for all bcm63xx boards

[openwrt/svn-archive/archive.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 bc9ea8b17bae61ff6dfebd8bc14b532153f6a418..376b57e2fa94c6d1b4510f2b5ac021b94bb057bd 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
@@ -1,11 +1,12 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -318,6 +318,63 @@ static struct board_info __initdata boar
+@@ -831,6 +831,63 @@ static struct board_info __initdata boar
+               },
        },
  };
- 
-+      static struct board_info __initdata board_V2500V_BB = {
-+        .name                           = "V2500V_BB",
++
++static struct board_info __initdata board_V2500V_BB = {
++      .name                           = "V2500V_BB",
 +        .expected_cpu_id                = 0x6348,
 +
 +        .has_uart0                      = 1,
@@ -20,31 +21,31 @@
 +        .enet1 = {
 +                .force_speed_100        = 1,
 +                .force_duplex_full      = 1,
-+        },
++      },
 +
-+      .leds = {
++      .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,
 +              },
@@ -56,15 +57,14 @@
 +                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
-+                      .threshold      = 3,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
 +              },
 +      },
 +};
-+
  #endif
  
  /*
-@@ -1784,6 +1841,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,9 +72,9 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1937,6 +1995,22 @@ void __init board_prom_init(void)
-       val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-       val &= MPI_CSBASE_BASE_MASK;
+@@ -1908,6 +1966,23 @@ void __init board_prom_init(void)
+               val &= MPI_CSBASE_BASE_MASK;
+       }
        boot_addr = (u8 *)KSEG1ADDR(val);
 +      printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr);
 +
@@ -83,11 +83,12 @@
 +      /* Loading firmware from the CFE Prompt always loads to Bank 0 */
 +      /* Do an early check of CFE and then select bank 0 */
 +
-+              if (boot_addr == (u8 *)0xbf800000) {
++      if (boot_addr == (u8 *)0xbf800000) {
++              unsigned char board_name[16];
 +              u8 *tmp_boot_addr;
 +              tmp_boot_addr = (u8 *)0xbfc00000; // Address of Bank 0
-+              memcpy(&nvram, tmp_boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));
-+              if (!strcmp(nvram.name, "V2500V_BB")) {
++              memcpy(board_name, tmp_boot_addr + BCM963XX_NVRAM_OFFSET + offsetof(struct bcm963xx_nvram, name), sizeof(board_name));
++              if (!strcmp(board_name, "V2500V_BB")) {
 +                      printk(KERN_INFO PFX "V2500V: nvram bank 0\n");
 +                      boot_addr = (u8 *)0xbfc00000; // Bank 0
 +              }
@@ -95,17 +96,27 @@
  
        /* dump cfe version */
        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2158,6 +2232,13 @@ int __init board_register_devices(void)
-       val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-       val &= MPI_CSBASE_BASE_MASK;
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -18,6 +18,7 @@
+ #include <linux/spi/spi.h>
+ #include <linux/spi/flash.h>
  
-+      /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks */
-+      /* Loading from CFE always uses Bank 0 */
-+      if (!strcmp(board.name, "V2500V_BB")) {
-+              printk(KERN_INFO PFX "V2500V: Start in Bank 0\n");
-+              val = val + 0x400000; // Select Bank 0 start address
-+      }
++#include <bcm63xx_board.h>
+ #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
+               val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+               val &= MPI_CSBASE_BASE_MASK;
+ 
++              /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks */
++              /* Loading from CFE always uses Bank 0 */
++              if (!strcmp(board_get_name(), "V2500V_BB")) {
++                      pr_info("V2500V: Start in Bank 0\n");
++                      val = val + 0x400000; // Select Bank 0 start address
++              }
 +
-       mtd_resources[0].start = val;
-       mtd_resources[0].end = 0x1FFFFFFF;
+               mtd_resources[0].start = val;
+               mtd_resources[0].end = 0x1FFFFFFF;