ar71xx: make ar934x_nfc driver compatible with 3.7

[openwrt/openwrt.git] / target / linux / ar71xx / patches-3.3 / 608-MIPS-ath79-ubnt-xm-add-more-boards.patch

diff --git a/target/linux/ar71xx/patches-3.3/608-MIPS-ath79-ubnt-xm-add-more-boards.patch b/target/linux/ar71xx/patches-3.3/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
index 982860f561b4da79c193680b67c98f6748e6a916..bee07b35c882f986c5ece240439c3238da4c99a9 100644 (file)
--- a/target/linux/ar71xx/patches-3.3/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
+++ b/target/linux/ar71xx/patches-3.3/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
@@ -57,7 +57,7 @@
  
        ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_xm_leds_gpio),
                                 ubnt_xm_leds_gpio);
-@@ -79,9 +85,99 @@ static void __init ubnt_xm_init(void)
+@@ -79,9 +85,112 @@ static void __init ubnt_xm_init(void)
  
        ath79_register_m25p80(NULL);
        ap91_pci_init(eeprom, NULL);
@@ -99,6 +99,11 @@
 +              .name           = "ubnt:green:globe",
 +              .gpio           = 0,
 +              .active_low     = 1,
++      }, {
++              .name           = "ubnt:green:power",
++              .gpio           = 11,
++              .active_low     = 1,
++              .default_state  = LEDS_GPIO_DEFSTATE_ON,
 +      }
 +};
 +
@@ -120,6 +125,10 @@
 +      ap91_pci_init(ee, NULL);
 +      ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_airrouter_leds_gpio),
 +                               ubnt_airrouter_leds_gpio);
++
++      ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
++                                        ARRAY_SIZE(ubnt_xm_gpio_keys),
++                                        ubnt_xm_gpio_keys);
 +}
 +
 +MIPS_MACHINE(ATH79_MACH_UBNT_AIRROUTER, "UBNT-AR", "Ubiquiti AirRouter",
@@ -153,13 +162,17 @@
 +
 +      ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_leds_gpio),
 +                               ubnt_unifi_leds_gpio);
++
++      ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
++                                        ARRAY_SIZE(ubnt_xm_gpio_keys),
++                                        ubnt_xm_gpio_keys);
 +}
 +
 +MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI, "UBNT-UF", "Ubiquiti UniFi",
 +           ubnt_unifi_setup);
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -58,9 +58,11 @@ config ATH79_MACH_UBNT_XM
+@@ -71,9 +71,11 @@ config ATH79_MACH_UBNT_XM
        bool "Ubiquiti Networks XM (rev 1.0) board"
        select SOC_AR724X
        select ATH79_DEV_AP9X_PCI if PCI
@@ -173,7 +186,7 @@
          Ubiquiti Networks XM (rev 1.0) board.
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -21,6 +21,11 @@ enum ath79_mach_type {
+@@ -22,6 +22,11 @@ enum ath79_mach_type {
        ATH79_MACH_AP81,                /* Atheros AP81 reference board */
        ATH79_MACH_DB120,               /* Atheros DB120 reference board */
        ATH79_MACH_PB44,                /* Atheros PB44 reference board */