ixp4xx: clean up patches, fold the 2.6.37 update patch into the relevant board suppor...

[openwrt.git] / target / linux / brcm63xx / patches-2.6.35 / 150-alice_gate2_leds.patch

diff --git a/target/linux/brcm63xx/patches-2.6.35/150-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-2.6.35/150-alice_gate2_leds.patch
index a13a943..fa5ca81 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.35/150-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/150-alice_gate2_leds.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -603,6 +603,93 @@ static struct board_info __initdata boar
+@@ -588,6 +588,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
@@ -82,15 +82,21 @@
 +
 +      .buttons = {
 +              {
-+                      .desc           = "sw2",
++                      .desc           = "reset",
 +                      .gpio           = 37,
 +                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 34,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .threshold      = 3,
++              },
 +      },
-+      /* sw1 is connected to gpio34*/
  };
  
  static struct board_info __initdata board_DWVS0 = {
@@ -100,7 +106,7 @@
        struct bcm63xx_dsp_platform_data dsp;
  
        /* GPIO LEDs */
--      struct gpio_led leds[8];
+-      struct gpio_led leds[5];
 +      struct gpio_led leds[14];
  
        /* Buttons */