ar71xx: add an id argument to ar71xx_add_device_mdio

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
index 72a8bd21f6ca566c932b553ca1745af31423c313..ab5d18716d7dc67722d5ff10edf0b69c8f8fbecb 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
@@ -30,8 +30,9 @@
 #define TL_WA901ND_V2_GPIO_BTN_RESET           3
 #define TL_WA901ND_V2_GPIO_BTN_QSS             7
 
-#define TL_WA901ND_V2_BUTTONS_POLL_INTERVAL    20
-
+#define TL_WA901ND_V2_KEYS_POLL_INTERVAL       20      /* msecs */
+#define TL_WA901ND_V2_KEYS_DEBOUNCE_INTERVAL   \
+                                       (3 * TL_WA901ND_V2_KEYS_POLL_INTERVAL)
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition tl_wa901nd_v2_partitions[] = {
        {
@@ -69,32 +70,32 @@ static struct flash_platform_data tl_wa901nd_v2_flash_data = {
 
 static struct gpio_led tl_wa901nd_v2_leds_gpio[] __initdata = {
        {
-               .name           = "tl-wa901nd-v2:green:system",
+               .name           = "tp-link:green:system",
                .gpio           = TL_WA901ND_V2_GPIO_LED_SYSTEM,
                .active_low     = 1,
        }, {
-               .name           = "tl-wa901nd-v2:green:qss",
+               .name           = "tp-link:green:qss",
                .gpio           = TL_WA901ND_V2_GPIO_LED_QSS,
        }, {
-               .name           = "tl-wa901nd-v2:green:wlan",
+               .name           = "tp-link:green:wlan",
                .gpio           = TL_WA901ND_V2_GPIO_LED_WLAN,
                .active_low     = 1,
        }
 };
 
-static struct gpio_button tl_wa901nd_v2_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tl_wa901nd_v2_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = TL_WA901ND_V2_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WA901ND_V2_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = TL_WA901ND_V2_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WA901ND_V2_GPIO_BTN_QSS,
                .active_low     = 1,
        }
@@ -109,7 +110,7 @@ static void __init tl_wa901nd_v2_setup(void)
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
        ar71xx_eth0_data.phy_mask = 0x00001000;
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_eth0_data.reset_bit = RESET_MODULE_GE0_MAC |
                                     RESET_MODULE_GE0_PHY;
@@ -120,9 +121,9 @@ static void __init tl_wa901nd_v2_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wa901nd_v2_leds_gpio),
                                        tl_wa901nd_v2_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, TL_WA901ND_V2_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(tl_wa901nd_v2_gpio_buttons),
-                                       tl_wa901nd_v2_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, TL_WA901ND_V2_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(tl_wa901nd_v2_gpio_keys),
+                                        tl_wa901nd_v2_gpio_keys);
 
         ar9xxx_add_device_wmac(eeprom, mac);
 }