ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-dir-600-a1.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
index bb59dfb7a7d130ff3d2caf2d8d163417d16d82f9..34f77dde3e03422d7016de29a27e3bc143a585ef 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
@@ -28,7 +28,8 @@
 #define DIR_600_A1_GPIO_BTN_RESET              8
 #define DIR_600_A1_GPIO_BTN_WPS                        12
 
-#define DIR_600_A1_BUTTONS_POLL_INTERVAL       20
+#define DIR_600_A1_KEYS_POLL_INTERVAL  20      /* msecs */
+#define DIR_600_A1_KEYS_DEBOUNCE_INTERVAL (3 * DIR_600_A1_KEYS_POLL_INTERVAL)
 
 #define DIR_600_A1_NVRAM_ADDR  0x1f030000
 #define DIR_600_A1_NVRAM_SIZE  0x10000
@@ -91,19 +92,19 @@ static struct gpio_led dir_600_a1_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button dir_600_a1_gpio_buttons[] __initdata = {
+static struct gpio_keys_button dir_600_a1_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = DIR_600_A1_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = DIR_600_A1_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = DIR_600_A1_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = DIR_600_A1_GPIO_BTN_WPS,
                .active_low     = 1,
        }
@@ -128,9 +129,9 @@ static void __init dir_600_a1_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(dir_600_a1_leds_gpio),
                                        dir_600_a1_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, DIR_600_A1_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(dir_600_a1_gpio_buttons),
-                                       dir_600_a1_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, DIR_600_A1_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(dir_600_a1_gpio_keys),
+                                        dir_600_a1_gpio_keys);
 
        ar71xx_eth1_data.has_ar7240_switch = 1;
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
@@ -140,6 +141,7 @@ static void __init dir_600_a1_setup(void)
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth0_data.speed = SPEED_100;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
+       ar71xx_eth0_data.phy_mask = BIT(4);
 
        /* LAN ports */
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;