ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-tl-wr741nd.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
index b2cee220bb28d1f9e73b49e33cc1d8a010a220f8..4732ab9cd8d5ed8aa9079cafb72744e46e5b2118 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
@@ -26,7 +26,8 @@
 #define TL_WR741ND_GPIO_BTN_RESET      11
 #define TL_WR741ND_GPIO_BTN_QSS                12
 
-#define TL_WR741ND_BUTTONS_POLL_INTERVAL       20
+#define TL_WR741ND_KEYS_POLL_INTERVAL  20      /* msecs */
+#define TL_WR741ND_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR741ND_KEYS_POLL_INTERVAL)
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition tl_wr741nd_partitions[] = {
@@ -35,20 +36,20 @@ static struct mtd_partition tl_wr741nd_partitions[] = {
                .offset         = 0,
                .size           = 0x020000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "kernel",
                .offset         = 0x020000,
                .size           = 0x140000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x160000,
                .size           = 0x290000,
-       } , {
+       }, {
                .name           = "art",
                .offset         = 0x3f0000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "firmware",
                .offset         = 0x020000,
                .size           = 0x3d0000,
@@ -58,8 +59,8 @@ static struct mtd_partition tl_wr741nd_partitions[] = {
 
 static struct flash_platform_data tl_wr741nd_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = tl_wr741nd_partitions,
-        .nr_parts       = ARRAY_SIZE(tl_wr741nd_partitions),
+       .parts          = tl_wr741nd_partitions,
+       .nr_parts       = ARRAY_SIZE(tl_wr741nd_partitions),
 #endif
 };
 
@@ -75,19 +76,19 @@ static struct gpio_led tl_wr741nd_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button tl_wr741nd_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tl_wr741nd_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = TL_WR741ND_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WR741ND_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = TL_WR741ND_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WR741ND_GPIO_BTN_QSS,
                .active_low     = 1,
        }
@@ -103,9 +104,9 @@ static void __init tl_wr741nd_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr741nd_leds_gpio),
                                        tl_wr741nd_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, TL_WR741ND_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(tl_wr741nd_gpio_buttons),
-                                       tl_wr741nd_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, TL_WR741ND_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(tl_wr741nd_gpio_keys),
+                                        tl_wr741nd_gpio_keys);
 
        ar71xx_eth1_data.has_ar7240_switch = 1;
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
@@ -115,6 +116,7 @@ static void __init tl_wr741nd_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;
@@ -125,6 +127,8 @@ static void __init tl_wr741nd_setup(void)
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 
+       ap91_pci_setup_wmac_led_pin(1);
+
        ap91_pci_init(ee, mac);
 }
 MIPS_MACHINE(AR71XX_MACH_TL_WR741ND, "TL-WR741ND", "TP-LINK TL-WR741ND",