bcm63xx: fix WPS button polarity for Alice Gate VoIP 2 + Wifi

[openwrt.git] / target / linux / brcm63xx / patches-3.3 / 550-alice_gate2_leds.patch

diff --git a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
index f0e23b7ab1032f305727c4d810649bc14b893ef2..98b988df1d44637f1a796eac2455419eb303f088 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
@@ -1,80 +1,79 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1303,6 +1303,99 @@ static struct board_info __initdata boar
+@@ -1612,6 +1612,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
 +
 +      .leds = {
-+              /*Each led on alice gate is bi-color */
 +              {
-+                      .name           = "power:red",
++                      .name           = "AGPF-S0:red:power",
 +                      .gpio           = 5,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "power:green",
++                      .name           = "AGPF-S0:green:power",
 +                      .gpio           = 4,
 +                      .active_low     = 1,
 +                      .default_trigger = "default-on",
 +              },
 +              {
-+                      .name           = "service:red",
++                      .name           = "AGPF-S0:red:service",
 +                      .gpio           = 7,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "service:green",
++                      .name           = "AGPF-S0:green:service",
 +                      .gpio           = 6,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "adsl:green",
++                      .name           = "AGPF-S0:green:adsl",
 +                      .gpio           = 9,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "adsl:red",
++                      .name           = "AGPF-S0:red:adsl",
 +                      .gpio           = 10,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "wifi:red",
++                      .name           = "AGPF-S0:red:wifi",
 +                      .gpio           = 23,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "wifi:green",
++                      .name           = "AGPF-S0:green:wifi",
 +                      .gpio           = 22,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "internet:green",
++                      .name           = "AGPF-S0:green:internet",
 +                      .gpio           = 25,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "internet:red",
++                      .name           = "AGPF-S0:red:internet",
 +                      .gpio           = 24,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "usr1:red",
++                      .name           = "AGPF-S0:red:usr1",
 +                      .gpio           = 27,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "usr1:green",
++                      .name           = "AGPF-S0:green:usr1",
 +                      .gpio           = 26,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "usr2:red",
++                      .name           = "AGPF-S0:red:usr2",
 +                      .gpio           = 30,
 +                      .active_low     = 1,
 +              },
 +              {
-+                      .name           = "usr2:green",
++                      .name           = "AGPF-S0:green:usr2",
 +                      .gpio           = 29,
 +                      .active_low     = 1,
 +              },
@@ -87,27 +86,17 @@
 +                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
-+                      .threshold      = 3,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
 +              },
 +              {
 +                      .desc           = "wps",
 +                      .gpio           = 34,
++                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_WPS_BUTTON,
-+                      .threshold      = 3,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
 +              },
 +      },
  };
  
  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
-@@ -57,7 +57,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[4];