[brcm63xx] board definitions: Added CPVA642 GPIO leds and buttons and refreshed patch...
authorDaniel Dickinson <crazycshore@gmail.com>
Mon, 6 Dec 2010 04:31:23 +0000 (04:31 +0000)
committerDaniel Dickinson <crazycshore@gmail.com>
Mon, 6 Dec 2010 04:31:23 +0000 (04:31 +0000)
SVN-Revision: 24274

target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch
target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch
target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch
target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch

index bc71425d947d9d864c92488b46209b931a804788..27049ee8d5a9dcdf55051a75a50e47a5470417d0 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -677,6 +677,26 @@ static struct board_info __initdata boar
+@@ -677,6 +677,103 @@ static struct board_info __initdata boar
        },
  };
  
 +      .has_ohci0 = 1,
 +      .has_ehci0 = 1,
 +
-+      /* GPIOs not yet known for this device */
++      .leds = {
++          /* bi-color */
++              {
++                      .name           = "power:red",
++                      .gpio           = 14,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "power:green",
++                      .gpio           = 11,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "wifi:red",
++                      .gpio           = 6,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "wifi:green",
++                      .gpio           = 8,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "link:red",
++                      .gpio           = 9,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "link:green",
++                      .gpio           = 10,
++                      .active_low     = 1,
++              },
++              /* green only */
++              {
++                      .name           = "ether",
++                      .gpio           = 1,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "phone1",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "phone2",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "phone2",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "usb",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++    },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 36,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .threshold      = 3,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .threshold      = 3,
++              },
++      },
 +};
 +
 +
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,
-@@ -1339,6 +1359,7 @@ static const struct board_info __initdat
+@@ -1339,6 +1436,7 @@ static const struct board_info __initdat
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,
index 693ef9e40b1ed388e77448206658071c4153730f..f012cb254b5890e625df8fed30d4c5cee20a82db 100644 (file)
@@ -60,7 +60,7 @@
  static struct board_info __initdata board_96358vw = {
        .name                           = "96358VW",
        .expected_cpu_id                = 0x6358,
-@@ -1356,6 +1409,7 @@ static const struct board_info __initdat
+@@ -1433,6 +1486,7 @@ static const struct board_info __initdat
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
index db1fac027d84912845fb37aef23bd510e59ea830..61a95af0bc751adf7cb7be1e8fc357a0eb887f79 100644 (file)
@@ -18,7 +18,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -1508,6 +1512,29 @@ static int board_get_mac_address(u8 *mac
+@@ -1586,6 +1590,29 @@ static int board_get_mac_address(u8 *mac
        return 0;
  }
  
@@ -48,7 +48,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -1559,6 +1586,11 @@ void __init board_prom_init(void)
+@@ -1637,6 +1664,11 @@ void __init board_prom_init(void)
        /* Fixup broken nb4 board name */
        nb4_nvram_fixup();
  
index 9724aa65076101983bee60300e7dc10355758a8a..c6f7ca6846cd24656f8af5655d693d9d364b4867 100644 (file)
@@ -68,7 +68,7 @@
  #endif
  
  /*
-@@ -1409,6 +1470,7 @@ static const struct board_info __initdat
+@@ -1487,6 +1548,7 @@ static const struct board_info __initdat
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,