[brcm63xx] patches-2.6.32/33: Reset button on Comtrend routers is GPIO 33 not GPIO 32

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

diff --git a/target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch
index 10a7fd9..4eea7f4 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/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
-@@ -589,6 +589,63 @@ static struct board_info __initdata boar
+@@ -573,6 +573,93 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
@@ -19,6 +19,26 @@
 +                      .default_trigger = "default-on",
 +              },
 +              {
++                      .name           = "service:red",
++                      .gpio           = 7,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "service:green",
++                      .gpio           = 6,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "adsl:red",
++                      .gpio           = 9,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "adsl:green",
++                      .gpio           = 10,
++                      .active_low     = 1,
++              },
++              {
 +                      .name           = "wifi:red",
 +                      .gpio           = 23,
 +                      .active_low     = 1,
@@ -29,6 +49,16 @@
 +                      .active_low     = 1,
 +              },
 +              {
++                      .name           = "internet:red",
++                      .gpio           = 25,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "internet:green",
++                      .gpio           = 24,
++                      .active_low     = 1,
++              },
++              {
 +                      .name           = "usr1:red",
 +                      .gpio           = 27,
 +                      .active_low     = 1,
@@ -50,13 +80,13 @@
 +              },
 +      },
 +
-+      .reset_buttons = {
++      .buttons = {
 +              {
 +                      .desc           = "sw2",
 +                      .gpio           = 37,
 +                      .active_low     = 1,
 +                      .type           = EV_KEY,
-+                      .code           = BTN_0,
++                      .code           = KEY_RESTART,
 +                      .threshold      = 3,
 +              },
 +      },
@@ -64,3 +94,14 @@
  };
  
  static struct board_info __initdata board_DWVS0 = {
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -54,7 +54,7 @@ struct board_info {
+       struct bcm63xx_dsp_platform_data dsp;
+ 
+       /* GPIO LEDs */
+-      struct gpio_led leds[5];
++      struct gpio_led leds[14];
+ 
+       /* Buttons */
+       struct gpio_button buttons[2];