ar71xx: use backported QCA955x patches

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-3.8 / 609-MIPS-ath79-ap136-fixes.patch

diff --git a/target/linux/ar71xx/patches-3.8/609-MIPS-ath79-ap136-fixes.patch b/target/linux/ar71xx/patches-3.8/609-MIPS-ath79-ap136-fixes.patch
index 6358e478074924dc86ab98b6b0c1fb04cd1c56ff..0a8fe0e4b8ba9dc09cd061333b4e6406535470fa 100644 (file)
--- a/target/linux/ar71xx/patches-3.8/609-MIPS-ath79-ap136-fixes.patch
+++ b/target/linux/ar71xx/patches-3.8/609-MIPS-ath79-ap136-fixes.patch
@@ -1,12 +1,5 @@
 --- a/arch/mips/ath79/mach-ap136.c
 +++ b/arch/mips/ath79/mach-ap136.c
-@@ -1,5 +1,5 @@
- /*
-- * Qualcomm Atheros AP136 reference board support
-+ * Atheros AP136 reference board support
-  *
-  * Copyright (c) 2012 Qualcomm Atheros
-  * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
 @@ -18,23 +18,28 @@
   *
   */
@@ -44,7 +37,7 @@
  #define AP136_GPIO_LED_WPS_GREEN      20
  
  #define AP136_GPIO_BTN_WPS            16
-@@ -43,8 +48,10 @@
+@@ -43,37 +48,39 @@
  #define AP136_KEYS_POLL_INTERVAL      20      /* msecs */
  #define AP136_KEYS_DEBOUNCE_INTERVAL  (3 * AP136_KEYS_POLL_INTERVAL)
  
@@ -57,7 +50,42 @@
  
  static struct gpio_led ap136_leds_gpio[] __initdata = {
        {
-@@ -98,64 +105,158 @@ static struct gpio_keys_button ap136_gpi
+-              .name           = "qca:green:status",
++              .name           = "ap136:green:status",
+               .gpio           = AP136_GPIO_LED_STATUS_GREEN,
+               .active_low     = 1,
+       },
+       {
+-              .name           = "qca:red:status",
++              .name           = "ap136:red:status",
+               .gpio           = AP136_GPIO_LED_STATUS_RED,
+               .active_low     = 1,
+       },
+       {
+-              .name           = "qca:green:wps",
++              .name           = "ap136:green:wps",
+               .gpio           = AP136_GPIO_LED_WPS_GREEN,
+               .active_low     = 1,
+       },
+       {
+-              .name           = "qca:red:wps",
++              .name           = "ap136:red:wps",
+               .gpio           = AP136_GPIO_LED_WPS_RED,
+               .active_low     = 1,
+       },
+       {
+-              .name           = "qca:red:wlan-2g",
++              .name           = "ap136:red:wlan-2g",
+               .gpio           = AP136_GPIO_LED_WLAN_2G,
+               .active_low     = 1,
+       },
+       {
+-              .name           = "qca:red:usb",
++              .name           = "ap136:red:usb",
+               .gpio           = AP136_GPIO_LED_USB,
+               .active_low     = 1,
+       }
+@@ -98,65 +105,158 @@ static struct gpio_keys_button ap136_gpi
        },
  };
  
@@ -204,10 +232,11 @@
 +      ath79_eth1_pll_data.pll_1000 = 0x03000101;
 +
 +      ap136_common_setup();
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_AP136_010, "AP136-010",
-+           "Atheros AP136-010 reference board",
+ }
+ 
+ MIPS_MACHINE(ATH79_MACH_AP136_010, "AP136-010",
+            "Atheros AP136-010 reference board",
+-           ap136_setup);
 +           ap136_010_setup);
 +
 +static void __init ap136_020_setup(void)
@@ -247,10 +276,8 @@
 +      ap136_leds_gpio[5].name = "ap135:red:usb";
 +
 +      ap136_020_setup();
- }
- 
--MIPS_MACHINE(ATH79_MACH_AP136, "AP136", "Atheros AP136 reference board",
--           ap136_setup);
++}
++
 +MIPS_MACHINE(ATH79_MACH_AP135_020, "AP135-020",
 +           "Atheros AP135-020 reference board",
 +           ap135_020_setup);
@@ -260,9 +287,8 @@
        ATH79_MACH_GENERIC = 0,
        ATH79_MACH_AP121,               /* Atheros AP121 reference board */
        ATH79_MACH_AP121_MINI,          /* Atheros AP121-MINI reference board */
--      ATH79_MACH_AP136,               /* Atheros AP136 reference board */
 +      ATH79_MACH_AP135_020,           /* Atheros AP135-020 reference board */
-+      ATH79_MACH_AP136_010,           /* Atheros AP136-010 reference board */
+       ATH79_MACH_AP136_010,           /* Atheros AP136-010 reference board */
 +      ATH79_MACH_AP136_020,           /* Atheros AP136-020 reference board */
        ATH79_MACH_AP81,                /* Atheros AP81 reference board */
        ATH79_MACH_DB120,               /* Atheros DB120 reference board */