ar71xx: build ALFA AP96 images with default profile as well

[oweals/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-ubnt.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
index 1cfcec38e6ef1c1ed8469c4aba5887d0ef952095..8f1a1355d41d8148fac72b6c6b52937e677d4e73 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -123,9 +123,18 @@ static struct gpio_keys_button ubnt_m_gpio_keys[] __initdata = {
        }
 };
 
+static const char *ubnt_part_probes[] = {
+       "RedBoot",
+       NULL,
+};
+
+static struct flash_platform_data ubnt_flash_data = {
+       .part_probes    = ubnt_part_probes,
+};
+
 static void __init ubnt_generic_setup(void)
 {
-       ar71xx_add_device_m25p80(NULL);
+       ar71xx_add_device_m25p80(&ubnt_flash_data);
 
        ar71xx_register_gpio_keys_polled(-1, UBNT_KEYS_POLL_INTERVAL,
                                         ARRAY_SIZE(ubnt_gpio_keys),
@@ -145,14 +154,14 @@ static void __init ubnt_init_secondary_mac(unsigned char *mac_base)
        ar71xx_eth1_data.mac_addr[0] |= 0x02;
 }
 
-#define UBNT_RS_WAN_PHYMASK    (1 << 20)
-#define UBNT_RS_LAN_PHYMASK    ((1 << 16) | (1 << 17) | (1 << 18) | (1 << 19))
+#define UBNT_RS_WAN_PHYMASK    BIT(20)
+#define UBNT_RS_LAN_PHYMASK    (BIT(16) | BIT(17) | BIT(18) | BIT(19))
 
 static void __init ubnt_rs_setup(void)
 {
        ubnt_generic_setup();
 
-       ar71xx_add_device_mdio(~(UBNT_RS_WAN_PHYMASK | UBNT_RS_LAN_PHYMASK));
+       ar71xx_add_device_mdio(0, ~(UBNT_RS_WAN_PHYMASK | UBNT_RS_LAN_PHYMASK));
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
@@ -175,14 +184,14 @@ static void __init ubnt_rs_setup(void)
 MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "UBNT-RS", "Ubiquiti RouterStation",
             ubnt_rs_setup);
 
-#define UBNT_RSPRO_WAN_PHYMASK (1 << 4)
-#define UBNT_RSPRO_LAN_PHYMASK ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3))
+#define UBNT_RSPRO_WAN_PHYMASK BIT(4)
+#define UBNT_RSPRO_LAN_PHYMASK (BIT(0) | BIT(1) | BIT(2) | BIT(3))
 
 static void __init ubnt_rspro_setup(void)
 {
        ubnt_generic_setup();
 
-       ar71xx_add_device_mdio(~(UBNT_RSPRO_WAN_PHYMASK |
+       ar71xx_add_device_mdio(0, ~(UBNT_RSPRO_WAN_PHYMASK |
                                 UBNT_RSPRO_LAN_PHYMASK));
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
@@ -214,13 +223,13 @@ static void __init ubnt_lsx_setup(void)
 
 MIPS_MACHINE(AR71XX_MACH_UBNT_LSX, "UBNT-LSX", "Ubiquiti LSX", ubnt_lsx_setup);
 
-#define UBNT_LSSR71_PHY_MASK   (1 << 1)
+#define UBNT_LSSR71_PHY_MASK   BIT(1)
 
 static void __init ubnt_lssr71_setup(void)
 {
        ubnt_generic_setup();
 
-       ar71xx_add_device_mdio(~UBNT_LSSR71_PHY_MASK);
+       ar71xx_add_device_mdio(0, ~UBNT_LSSR71_PHY_MASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
@@ -235,6 +244,8 @@ static void __init ubnt_lssr71_setup(void)
 MIPS_MACHINE(AR71XX_MACH_UBNT_LSSR71, "UBNT-LS-SR71", "Ubiquiti LS-SR71",
             ubnt_lssr71_setup);
 
+#define UBNT_M_WAN_PHYMASK     BIT(4)
+
 static void __init ubnt_m_setup(void)
 {
        u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
@@ -243,17 +254,10 @@ static void __init ubnt_m_setup(void)
 
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(~0);
+       ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
        ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0);
-       ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
-       ar71xx_eth0_data.speed = SPEED_100;
-       ar71xx_eth0_data.duplex = DUPLEX_FULL;
-       ar71xx_eth0_data.fifo_cfg1 = 0x0010ffff;
-       ar71xx_eth0_data.fifo_cfg2 = 0x015500aa;
-       ar71xx_eth0_data.fifo_cfg3 = 0x01f00140;
-
        ar71xx_add_device_eth(0);
 
        ap91_pci_init(ee, NULL);
@@ -282,21 +286,43 @@ MIPS_MACHINE(AR71XX_MACH_UBNT_ROCKET_M, "UBNT-RM", "Ubiquiti Rocket M",
 static void __init ubnt_nano_m_setup(void)
 {
        ubnt_m_setup();
-
-       ar71xx_eth1_data.has_ar7240_switch = 1;
-       ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth1_data.speed = SPEED_1000;
-       ar71xx_eth1_data.duplex = DUPLEX_FULL;
-       ar71xx_eth1_data.fifo_cfg1 = 0x0010ffff;
-       ar71xx_eth1_data.fifo_cfg2 = 0x015500aa;
-       ar71xx_eth1_data.fifo_cfg3 = 0x01f00140;
-
        ar71xx_add_device_eth(1);
 }
 
 MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M",
             ubnt_nano_m_setup);
 
+static struct gpio_led ubnt_airrouter_leds_gpio[] __initdata = {
+       {
+               .name           = "ubnt:green:globe",
+               .gpio           = 0,
+               .active_low     = 1,
+       }
+};
+
+static void __init ubnt_airrouter_setup(void)
+{
+       u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
+       u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+       ar71xx_add_device_m25p80(NULL);
+       ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK);
+
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
+       ubnt_init_secondary_mac(mac1);
+
+       ar71xx_add_device_eth(1);
+       ar71xx_add_device_eth(0);
+       ar71xx_add_device_usb();
+
+       ap91_pci_init(ee, NULL);
+       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_airrouter_leds_gpio),
+                                       ubnt_airrouter_leds_gpio);
+}
+
+MIPS_MACHINE(AR71XX_MACH_UBNT_AIRROUTER, "UBNT-AR", "Ubiquiti AirRouter",
+            ubnt_airrouter_setup);
+
 static struct gpio_led ubnt_unifi_leds_gpio[] __initdata = {
        {
                .name           = "ubnt:orange:dome",
@@ -316,13 +342,9 @@ static void __init ubnt_unifi_setup(void)
 
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(~0);
+       ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
-       ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
-       ar71xx_eth0_data.speed = SPEED_100;
-       ar71xx_eth0_data.duplex = DUPLEX_FULL;
-
        ar71xx_add_device_eth(0);
 
        ap91_pci_init(ee, NULL);
@@ -331,5 +353,5 @@ static void __init ubnt_unifi_setup(void)
                                        ubnt_unifi_leds_gpio);
 }
 
-MIPS_MACHINE(AR71XX_MACH_UBNT_UNIFI, "UBNT-XM", "Ubiquiti UniFi",
+MIPS_MACHINE(AR71XX_MACH_UBNT_UNIFI, "UBNT-UF", "Ubiquiti UniFi",
             ubnt_unifi_setup);