ar71xx: merge unifi outdoor patch into the ubnt-xm one
authorGabor Juhos <juhosg@openwrt.org>
Fri, 14 Dec 2012 07:16:50 +0000 (07:16 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Fri, 14 Dec 2012 07:16:50 +0000 (07:16 +0000)
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34673

target/linux/ar71xx/patches-3.3/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch
target/linux/ar71xx/patches-3.3/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch [deleted file]
target/linux/ar71xx/patches-3.6/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
target/linux/ar71xx/patches-3.6/610-MIPS-ath79-openwrt-machines.patch
target/linux/ar71xx/patches-3.6/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch [deleted file]

index bee07b3..4b880e9 100644 (file)
@@ -57,7 +57,7 @@
  
        ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_xm_leds_gpio),
                                 ubnt_xm_leds_gpio);
-@@ -79,9 +85,112 @@ static void __init ubnt_xm_init(void)
+@@ -79,9 +85,155 @@ static void __init ubnt_xm_init(void)
  
        ath79_register_m25p80(NULL);
        ap91_pci_init(eeprom, NULL);
 +      }
 +};
 +
++static struct gpio_led ubnt_unifi_outdoor_leds_gpio[] __initdata = {
++      {
++              .name           = "ubnt:orange:front",
++              .gpio           = 1,
++              .active_low     = 0,
++      }, {
++              .name           = "ubnt:green:front",
++              .gpio           = 0,
++              .active_low     = 0,
++      }
++};
++
++
 +static void __init ubnt_unifi_setup(void)
 +{
 +      u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
 +
 +MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI, "UBNT-UF", "Ubiquiti UniFi",
 +           ubnt_unifi_setup);
++
++
++#define UBNT_UNIFIOD_PRI_PHYMASK      BIT(4)
++#define UBNT_UNIFIOD_2ND_PHYMASK      (BIT(0) | BIT(1) | BIT(2) | BIT(3))
++
++static void __init ubnt_unifi_outdoor_setup(void)
++{
++      u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
++      u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
++      u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
++
++      ath79_register_m25p80(NULL);
++
++      ath79_register_mdio(0, ~(UBNT_UNIFIOD_PRI_PHYMASK |
++                               UBNT_UNIFIOD_2ND_PHYMASK));
++
++      ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
++      ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
++      ath79_register_eth(0);
++      ath79_register_eth(1);
++
++      ap91_pci_init(ee, NULL);
++
++      ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_leds_gpio),
++                               ubnt_unifi_outdoor_leds_gpio);
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI_OUTDOOR, "UBNT-U20",
++           "Ubiquiti UniFiAP Outdoor",
++           ubnt_unifi_outdoor_setup);
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
 @@ -71,9 +71,11 @@ config ATH79_MACH_UBNT_XM
          Ubiquiti Networks XM (rev 1.0) board.
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -22,6 +22,11 @@ enum ath79_mach_type {
+@@ -22,6 +22,12 @@ 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 */
 +      ATH79_MACH_UBNT_NANO_M,         /* Ubiquiti NanoStation M */
 +      ATH79_MACH_UBNT_ROCKET_M,       /* Ubiquiti Rocket M */
 +      ATH79_MACH_UBNT_UNIFI,          /* Ubiquiti Unifi */
++      ATH79_MACH_UBNT_UNIFI_OUTDOOR,  /* Ubiquiti UnifiAP Outdoor */
        ATH79_MACH_UBNT_XM,             /* Ubiquiti Networks XM board rev 1.0 */
  };
  
index 0230908..1ef47e6 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -16,18 +16,102 @@
+@@ -16,19 +16,103 @@
  
  enum ath79_mach_type {
        ATH79_MACH_GENERIC = 0,
@@ -83,6 +83,7 @@
 +      ATH79_MACH_UBNT_RSPRO,          /* Ubiquiti RouterStation Pro */
 +      ATH79_MACH_UBNT_RS,             /* Ubiquiti RouterStation */
        ATH79_MACH_UBNT_UNIFI,          /* Ubiquiti Unifi */
+       ATH79_MACH_UBNT_UNIFI_OUTDOOR,  /* Ubiquiti UnifiAP Outdoor */
        ATH79_MACH_UBNT_XM,             /* Ubiquiti Networks XM board rev 1.0 */
 +      ATH79_MACH_WHR_G301N,           /* Buffalo WHR-G301N */
 +      ATH79_MACH_WHR_HP_G300N,        /* Buffalo WHR-HP-G300N */
diff --git a/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch b/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch
deleted file mode 100644 (file)
index 8a1c770..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/arch/mips/ath79/mach-ubnt-xm.c
-+++ b/arch/mips/ath79/mach-ubnt-xm.c
-@@ -170,6 +170,19 @@ static struct gpio_led ubnt_unifi_leds_g
-       }
- };
-+static struct gpio_led ubnt_unifi_outdoor_leds_gpio[] __initdata = {
-+      {
-+              .name           = "ubnt:orange:front",
-+              .gpio           = 1,
-+              .active_low     = 0,
-+      }, {
-+              .name           = "ubnt:green:front",
-+              .gpio           = 0,
-+              .active_low     = 0,
-+      }
-+};
-+
-+
- static void __init ubnt_unifi_setup(void)
- {
-       u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
-@@ -194,3 +207,33 @@ static void __init ubnt_unifi_setup(void
- MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI, "UBNT-UF", "Ubiquiti UniFi",
-            ubnt_unifi_setup);
-+
-+
-+#define UBNT_UNIFIOD_PRI_PHYMASK      BIT(4)
-+#define UBNT_UNIFIOD_2ND_PHYMASK      (BIT(0) | BIT(1) | BIT(2) | BIT(3))
-+
-+static void __init ubnt_unifi_outdoor_setup(void)
-+{
-+      u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
-+      u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
-+      u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-+
-+      ath79_register_m25p80(NULL);
-+
-+      ath79_register_mdio(0, ~(UBNT_UNIFIOD_PRI_PHYMASK |
-+                               UBNT_UNIFIOD_2ND_PHYMASK));
-+
-+      ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
-+      ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
-+      ath79_register_eth(0);
-+      ath79_register_eth(1);
-+
-+      ap91_pci_init(ee, NULL);
-+
-+      ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_leds_gpio),
-+                               ubnt_unifi_outdoor_leds_gpio);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI_OUTDOOR, "UBNT-U20",
-+           "Ubiquiti UniFiAP Outdoor",
-+           ubnt_unifi_outdoor_setup);
---- a/arch/mips/ath79/machtypes.h
-+++ b/arch/mips/ath79/machtypes.h
-@@ -97,6 +97,7 @@ enum ath79_mach_type {
-       ATH79_MACH_UBNT_RSPRO,          /* Ubiquiti RouterStation Pro */
-       ATH79_MACH_UBNT_RS,             /* Ubiquiti RouterStation */
-       ATH79_MACH_UBNT_UNIFI,          /* Ubiquiti Unifi */
-+      ATH79_MACH_UBNT_UNIFI_OUTDOOR,  /* Ubiquiti UnifiAP Outdoor */
-       ATH79_MACH_UBNT_XM,             /* Ubiquiti Networks XM board rev 1.0 */
-       ATH79_MACH_WHR_G301N,           /* Buffalo WHR-G301N */
-       ATH79_MACH_WHR_HP_G300N,        /* Buffalo WHR-HP-G300N */
index bee07b3..4b880e9 100644 (file)
@@ -57,7 +57,7 @@
  
        ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_xm_leds_gpio),
                                 ubnt_xm_leds_gpio);
-@@ -79,9 +85,112 @@ static void __init ubnt_xm_init(void)
+@@ -79,9 +85,155 @@ static void __init ubnt_xm_init(void)
  
        ath79_register_m25p80(NULL);
        ap91_pci_init(eeprom, NULL);
 +      }
 +};
 +
++static struct gpio_led ubnt_unifi_outdoor_leds_gpio[] __initdata = {
++      {
++              .name           = "ubnt:orange:front",
++              .gpio           = 1,
++              .active_low     = 0,
++      }, {
++              .name           = "ubnt:green:front",
++              .gpio           = 0,
++              .active_low     = 0,
++      }
++};
++
++
 +static void __init ubnt_unifi_setup(void)
 +{
 +      u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
 +
 +MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI, "UBNT-UF", "Ubiquiti UniFi",
 +           ubnt_unifi_setup);
++
++
++#define UBNT_UNIFIOD_PRI_PHYMASK      BIT(4)
++#define UBNT_UNIFIOD_2ND_PHYMASK      (BIT(0) | BIT(1) | BIT(2) | BIT(3))
++
++static void __init ubnt_unifi_outdoor_setup(void)
++{
++      u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
++      u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
++      u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
++
++      ath79_register_m25p80(NULL);
++
++      ath79_register_mdio(0, ~(UBNT_UNIFIOD_PRI_PHYMASK |
++                               UBNT_UNIFIOD_2ND_PHYMASK));
++
++      ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
++      ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
++      ath79_register_eth(0);
++      ath79_register_eth(1);
++
++      ap91_pci_init(ee, NULL);
++
++      ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_leds_gpio),
++                               ubnt_unifi_outdoor_leds_gpio);
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI_OUTDOOR, "UBNT-U20",
++           "Ubiquiti UniFiAP Outdoor",
++           ubnt_unifi_outdoor_setup);
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
 @@ -71,9 +71,11 @@ config ATH79_MACH_UBNT_XM
          Ubiquiti Networks XM (rev 1.0) board.
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -22,6 +22,11 @@ enum ath79_mach_type {
+@@ -22,6 +22,12 @@ 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 */
 +      ATH79_MACH_UBNT_NANO_M,         /* Ubiquiti NanoStation M */
 +      ATH79_MACH_UBNT_ROCKET_M,       /* Ubiquiti Rocket M */
 +      ATH79_MACH_UBNT_UNIFI,          /* Ubiquiti Unifi */
++      ATH79_MACH_UBNT_UNIFI_OUTDOOR,  /* Ubiquiti UnifiAP Outdoor */
        ATH79_MACH_UBNT_XM,             /* Ubiquiti Networks XM board rev 1.0 */
  };
  
index 0230908..1ef47e6 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -16,18 +16,102 @@
+@@ -16,19 +16,103 @@
  
  enum ath79_mach_type {
        ATH79_MACH_GENERIC = 0,
@@ -83,6 +83,7 @@
 +      ATH79_MACH_UBNT_RSPRO,          /* Ubiquiti RouterStation Pro */
 +      ATH79_MACH_UBNT_RS,             /* Ubiquiti RouterStation */
        ATH79_MACH_UBNT_UNIFI,          /* Ubiquiti Unifi */
+       ATH79_MACH_UBNT_UNIFI_OUTDOOR,  /* Ubiquiti UnifiAP Outdoor */
        ATH79_MACH_UBNT_XM,             /* Ubiquiti Networks XM board rev 1.0 */
 +      ATH79_MACH_WHR_G301N,           /* Buffalo WHR-G301N */
 +      ATH79_MACH_WHR_HP_G300N,        /* Buffalo WHR-HP-G300N */
diff --git a/target/linux/ar71xx/patches-3.6/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch b/target/linux/ar71xx/patches-3.6/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch
deleted file mode 100644 (file)
index 8a1c770..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/arch/mips/ath79/mach-ubnt-xm.c
-+++ b/arch/mips/ath79/mach-ubnt-xm.c
-@@ -170,6 +170,19 @@ static struct gpio_led ubnt_unifi_leds_g
-       }
- };
-+static struct gpio_led ubnt_unifi_outdoor_leds_gpio[] __initdata = {
-+      {
-+              .name           = "ubnt:orange:front",
-+              .gpio           = 1,
-+              .active_low     = 0,
-+      }, {
-+              .name           = "ubnt:green:front",
-+              .gpio           = 0,
-+              .active_low     = 0,
-+      }
-+};
-+
-+
- static void __init ubnt_unifi_setup(void)
- {
-       u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
-@@ -194,3 +207,33 @@ static void __init ubnt_unifi_setup(void
- MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI, "UBNT-UF", "Ubiquiti UniFi",
-            ubnt_unifi_setup);
-+
-+
-+#define UBNT_UNIFIOD_PRI_PHYMASK      BIT(4)
-+#define UBNT_UNIFIOD_2ND_PHYMASK      (BIT(0) | BIT(1) | BIT(2) | BIT(3))
-+
-+static void __init ubnt_unifi_outdoor_setup(void)
-+{
-+      u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
-+      u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
-+      u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-+
-+      ath79_register_m25p80(NULL);
-+
-+      ath79_register_mdio(0, ~(UBNT_UNIFIOD_PRI_PHYMASK |
-+                               UBNT_UNIFIOD_2ND_PHYMASK));
-+
-+      ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
-+      ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
-+      ath79_register_eth(0);
-+      ath79_register_eth(1);
-+
-+      ap91_pci_init(ee, NULL);
-+
-+      ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_leds_gpio),
-+                               ubnt_unifi_outdoor_leds_gpio);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI_OUTDOOR, "UBNT-U20",
-+           "Ubiquiti UniFiAP Outdoor",
-+           ubnt_unifi_outdoor_setup);
---- a/arch/mips/ath79/machtypes.h
-+++ b/arch/mips/ath79/machtypes.h
-@@ -97,6 +97,7 @@ enum ath79_mach_type {
-       ATH79_MACH_UBNT_RSPRO,          /* Ubiquiti RouterStation Pro */
-       ATH79_MACH_UBNT_RS,             /* Ubiquiti RouterStation */
-       ATH79_MACH_UBNT_UNIFI,          /* Ubiquiti Unifi */
-+      ATH79_MACH_UBNT_UNIFI_OUTDOOR,  /* Ubiquiti UnifiAP Outdoor */
-       ATH79_MACH_UBNT_XM,             /* Ubiquiti Networks XM board rev 1.0 */
-       ATH79_MACH_WHR_G301N,           /* Buffalo WHR-G301N */
-       ATH79_MACH_WHR_HP_G300N,        /* Buffalo WHR-HP-G300N */