ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

[openwrt/svn-archive/archive.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 5af18a7e05cac361227763963b6340c475d3ee3d..1cfcec38e6ef1c1ed8469c4aba5887d0ef952095 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -38,7 +38,8 @@
 #define UBNT_M_GPIO_LED_L4     7
 #define UBNT_M_GPIO_BTN_RESET  12
 
-#define UBNT_BUTTONS_POLL_INTERVAL     20
+#define UBNT_KEYS_POLL_INTERVAL                20      /* msecs */
+#define UBNT_KEYS_DEBOUNCE_INTERVAL    (3 * UBNT_KEYS_POLL_INTERVAL)
 
 static struct gpio_led ubnt_rs_leds_gpio[] __initdata = {
        {
@@ -100,23 +101,23 @@ static struct gpio_led ubnt_m_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button ubnt_gpio_buttons[] __initdata = {
+static struct gpio_keys_button ubnt_gpio_keys[] __initdata = {
        {
                .desc           = "sw4",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = UBNT_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = UBNT_RS_GPIO_SW4,
                .active_low     = 1,
        }
 };
 
-static struct gpio_button ubnt_m_gpio_buttons[] __initdata = {
+static struct gpio_keys_button ubnt_m_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = UBNT_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = UBNT_M_GPIO_BTN_RESET,
                .active_low     = 1,
        }
@@ -126,13 +127,24 @@ static void __init ubnt_generic_setup(void)
 {
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_gpio_buttons(-1, UBNT_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(ubnt_gpio_buttons),
-                                       ubnt_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, UBNT_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(ubnt_gpio_keys),
+                                        ubnt_gpio_keys);
 
        pb42_pci_init();
 }
 
+/*
+ * There is Secondary MAC address duplicate problem with some UBNT HW batches.
+ * Do not increase Secondary MAC address by 1 but do workaround
+ * with 'Locally Administrated' bit.
+ */
+static void __init ubnt_init_secondary_mac(unsigned char *mac_base)
+{
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac_base, 0);
+       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))
 
@@ -146,7 +158,7 @@ static void __init ubnt_rs_setup(void)
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
        ar71xx_eth0_data.phy_mask = UBNT_RS_WAN_PHYMASK;
 
-       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 1);
+       ubnt_init_secondary_mac(ar71xx_mac_base);
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.speed = SPEED_100;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
@@ -170,13 +182,14 @@ static void __init ubnt_rspro_setup(void)
 {
        ubnt_generic_setup();
 
-       ar71xx_add_device_mdio(~(UBNT_RSPRO_WAN_PHYMASK | UBNT_RSPRO_LAN_PHYMASK));
+       ar71xx_add_device_mdio(~(UBNT_RSPRO_WAN_PHYMASK |
+                                UBNT_RSPRO_LAN_PHYMASK));
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth0_data.phy_mask = UBNT_RSPRO_WAN_PHYMASK;
 
-       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 1);
+       ubnt_init_secondary_mac(ar71xx_mac_base);
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth1_data.phy_mask = UBNT_RSPRO_LAN_PHYMASK;
        ar71xx_eth1_data.speed = SPEED_1000;
@@ -224,15 +237,16 @@ MIPS_MACHINE(AR71XX_MACH_UBNT_LSSR71, "UBNT-LS-SR71", "Ubiquiti LS-SR71",
 
 static void __init ubnt_m_setup(void)
 {
-       u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
+       u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
+       u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
        u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
 
        ar71xx_add_device_m25p80(NULL);
 
        ar71xx_add_device_mdio(~0);
 
-       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
-       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
+       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;
@@ -247,9 +261,9 @@ static void __init ubnt_m_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_m_leds_gpio),
                                        ubnt_m_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, UBNT_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(ubnt_m_gpio_buttons),
-                                       ubnt_m_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, UBNT_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(ubnt_m_gpio_keys),
+                                        ubnt_m_gpio_keys);
 }
 
 static void __init ubnt_rocket_m_setup(void)
@@ -269,6 +283,7 @@ 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;
@@ -281,3 +296,40 @@ static void __init ubnt_nano_m_setup(void)
 
 MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M",
             ubnt_nano_m_setup);
+
+static struct gpio_led ubnt_unifi_leds_gpio[] __initdata = {
+       {
+               .name           = "ubnt:orange:dome",
+               .gpio           = 1,
+               .active_low     = 0,
+       }, {
+               .name           = "ubnt:green:dome",
+               .gpio           = 0,
+               .active_low     = 0,
+       }
+};
+
+static void __init ubnt_unifi_setup(void)
+{
+       u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
+       u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+       ar71xx_add_device_m25p80(NULL);
+
+       ar71xx_add_device_mdio(~0);
+
+       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);
+
+       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_leds_gpio),
+                                       ubnt_unifi_leds_gpio);
+}
+
+MIPS_MACHINE(AR71XX_MACH_UBNT_UNIFI, "UBNT-XM", "Ubiquiti UniFi",
+            ubnt_unifi_setup);