bcm63xx: fix WPS button polarity for Alice Gate VoIP 2 + Wifi
authorJonas Gorski <jogo@openwrt.org>
Sun, 9 Sep 2012 11:54:56 +0000 (11:54 +0000)
committerJonas Gorski <jogo@openwrt.org>
Sun, 9 Sep 2012 11:54:56 +0000 (11:54 +0000)
Fixes booting the device with button hotplug enabled (#10785).

SVN-Revision: 33340

target/linux/brcm63xx/patches-3.3/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
target/linux/brcm63xx/patches-3.3/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
target/linux/brcm63xx/patches-3.3/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
target/linux/brcm63xx/patches-3.3/433-MTD-m25p80-allow-passing-pp_data.patch
target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch

index c8959cc..486ec3a 100644 (file)
@@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -985,7 +985,8 @@ static int __devinit m25p_probe(struct s
+@@ -986,7 +986,8 @@ static int __devinit m25p_probe(struct s
        /* partitions should match sector boundaries; and it may be good to
         * use readonly partitions for writeprotected sectors (BP2..BP0).
         */
index dcb8810..847b695 100644 (file)
@@ -60,7 +60,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  /*
   * Write an address range to the flash chip.  Data must be written in
   * FLASH_PAGESIZE chunks.  The address range may be any size provided
-@@ -896,6 +918,9 @@ static int __devinit m25p_probe(struct s
+@@ -897,6 +919,9 @@ static int __devinit m25p_probe(struct s
                return -ENOMEM;
        }
  
index c79c3fe..742d115 100644 (file)
@@ -36,7 +36,7 @@ Subject: [PATCH 67/80] BCM63XX: allow providing fixup data in board data
                memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
                memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
                if (ssb_arch_register_fallback_sprom(
-@@ -931,5 +934,9 @@ int __init board_register_devices(void)
+@@ -933,5 +936,9 @@ int __init board_register_devices(void)
                platform_device_register(&bcm63xx_gpio_keys_device);
        }
  
index bda4807..5fef3f3 100644 (file)
@@ -10,7 +10,7 @@ Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
 
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -886,6 +886,9 @@ static int __devinit m25p_probe(struct s
+@@ -887,6 +887,9 @@ static int __devinit m25p_probe(struct s
                        dev_warn(&spi->dev, "unrecognized id %s\n", data->type);
        }
  
index c25aafd..98b988d 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1612,6 +1612,98 @@ static struct board_info __initdata boar
+@@ -1612,6 +1612,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
@@ -91,6 +91,7 @@
 +              {
 +                      .desc           = "wps",
 +                      .gpio           = 34,
++                      .active_low     = 1,
 +                      .type           = EV_KEY,
 +                      .code           = KEY_WPS_BUTTON,
 +                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
index 78ddd5f..724c849 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
  #include <linux/spi/74x164.h>
-@@ -3006,7 +3007,7 @@ static const struct board_info __initdat
+@@ -3007,7 +3008,7 @@ static const struct board_info __initdat
   * bcm4318 WLAN work
   */
  #ifdef CONFIG_SSB_PCIHOST
@@ -17,7 +17,7 @@
        .revision               = 0x02,
        .board_rev              = 0x17,
        .country_code           = 0x0,
-@@ -3026,6 +3027,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -3027,6 +3028,7 @@ static struct ssb_sprom bcm63xx_sprom =
        .boardflags_lo          = 0x2848,
        .boardflags_hi          = 0x0000,
  };