projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ip17xx: Fix indentation in get_state() and update_state()
[openwrt.git] / target / linux / brcm63xx / patches-2.6.32 / 221-board-NB4.patch
diff --git a/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch b/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
index 57ce7fc..a3b19b7 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
@@ -1,5 +1,7 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+Index: linux-2.6.32.13/arch/mips/bcm63xx/boards/board_bcm963xx.c
+===================================================================
+--- linux-2.6.32.13.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c     2010-05-27 21:45:09.000000000 -0400
++++ linux-2.6.32.13/arch/mips/bcm63xx/boards/board_bcm963xx.c  2010-05-27 21:46:39.000000000 -0400
 @@ -17,6 +17,7 @@
  #include <linux/ssb/ssb.h>
  #include <linux/gpio_buttons.h>
 @@ -17,6 +17,7 @@
  #include <linux/ssb/ssb.h>
  #include <linux/gpio_buttons.h>
@@ -21,7 +23,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -713,6 +720,441 @@ static struct board_info __initdata boar
+@@ -697,6 +704,471 @@
  
        .has_ohci0 = 1,
  };
  
        .has_ohci0 = 1,
  };
@@ -117,15 +119,21 @@
 +                      .active_low     = 1,
 +              },
 +      },
 +                      .active_low     = 1,
 +              },
 +      },
-+      .reset_buttons = {
++      .buttons = {
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
-+                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .threshold      = 3,
++              },
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
@@ -203,15 +211,21 @@
 +                      .active_low     = 1,
 +              },
 +      },
 +                      .active_low     = 1,
 +              },
 +      },
-+      .reset_buttons = {
++      .buttons = {
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
-+                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .threshold      = 3,
++              },
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
@@ -287,15 +301,21 @@
 +                      .active_low     = 1,
 +              },
 +      },
 +                      .active_low     = 1,
 +              },
 +      },
-+      .reset_buttons = {
++      .buttons = {
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
-+                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .threshold      = 3,
++              },
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
@@ -368,15 +388,21 @@
 +                      .gpio           = 4,
 +              },
 +      },
 +                      .gpio           = 4,
 +              },
 +      },
-+      .reset_buttons = {
++      .buttons = {
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
-+                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .threshold      = 3,
++              },
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
@@ -447,15 +473,21 @@
 +                      .gpio           = 4,
 +              },
 +      },
 +                      .gpio           = 4,
 +              },
 +      },
-+      .reset_buttons = {
++      .buttons = {
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
 +              {
 +                      .desc           = "reset",
 +                      .gpio           = 34,
-+                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .threshold      = 3,
++              },
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
 +      },
 +      .devs = neufbox4_devices,
 +      .num_devs = ARRAY_SIZE(neufbox4_devices),
@@ -463,7 +495,7 @@
  #endif
  
  /*
  #endif
  
  /*
-@@ -743,9 +1185,30 @@ static const struct board_info __initdat
+@@ -727,9 +1199,30 @@
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
@@ -494,7 +526,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -793,6 +1256,9 @@ void __init board_prom_init(void)
+@@ -777,6 +1270,9 @@
                return;
        }
  
                return;
        }
  
@@ -504,14 +536,16 @@
        /* find board by name */
        for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
                if (strncmp(nvram.name, bcm963xx_boards[i]->name,
        /* find board by name */
        for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
                if (strncmp(nvram.name, bcm963xx_boards[i]->name,
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -55,7 +55,7 @@ struct board_info {
+Index: linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+===================================================================
+--- linux-2.6.32.13.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h   2010-05-27 21:44:35.000000000 -0400
++++ linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h        2010-05-27 21:47:03.000000000 -0400
+@@ -55,7 +55,7 @@
        struct bcm63xx_dsp_platform_data dsp;
  
        /* GPIO LEDs */
        struct bcm63xx_dsp_platform_data dsp;
  
        /* GPIO LEDs */
--      struct gpio_led leds[8];
+-      struct gpio_led leds[5];
 +      struct gpio_led leds[9];
  
 +      struct gpio_led leds[9];
  
-       /* Reset button */
-       struct gpio_button reset_buttons[1];
+       /* Buttons */
+       struct gpio_button buttons[2];
Personal OpenWRT clone
This page took 0.028994 seconds and 4 git commands to generate.