[brcm63xx] fix board patches so that new boards are withing appropriate ifdef

[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 b6bf40f636d45b858f68d21476698deb61ceb36b..0fd10b155e010527567bb3015b4c5580e9ad6f5b 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,6 +1,6 @@
 --- 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
+@@ -1553,6 +1553,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
@@ -87,14 +87,14 @@
 +                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_RESTART,
-+                      .debounce_interval = 60,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
 +              },
 +              {
 +                      .desc           = "wps",
 +                      .gpio           = 34,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_WPS_BUTTON,
-+                      .debounce_interval = 60,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
 +              },
 +      },
  };
@@ -102,12 +102,12 @@
  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
-@@ -59,7 +59,7 @@ struct board_info {
+@@ -52,7 +52,7 @@ struct board_info {
        struct bcm63xx_dsp_platform_data dsp;
  
        /* GPIO LEDs */
--      struct gpio_led leds[5];
+-      struct gpio_led leds[10];
 +      struct gpio_led leds[14];
  
        /* Buttons */
-       struct gpio_button buttons[4];
+       struct gpio_keys_button buttons[4];