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-wr1043nd.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
index 1dc61c72db2e9daf6a655a87752e7e0ff5e2987e..1cf01684863b0ba66f9d4d677f084442220375e2 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
@@ -8,19 +8,19 @@
  *  by the Free Software Foundation.
  */
 
-#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/input.h>
-
-#include <asm/mips_machine.h>
-
+#include <linux/platform_device.h>
+#include <linux/rtl8366rb.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 
+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
-#include "dev-ar913x-wmac.h"
+#include "dev-ar9xxx-wmac.h"
+#include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
+#include "dev-usb.h"
 
 #define TL_WR1043ND_GPIO_LED_USB        1
 #define TL_WR1043ND_GPIO_LED_SYSTEM     2
@@ -30,7 +30,11 @@
 #define TL_WR1043ND_GPIO_BTN_RESET      3
 #define TL_WR1043ND_GPIO_BTN_QSS        7
 
-#define TL_WR1043ND_BUTTONS_POLL_INTERVAL     20
+#define TL_WR1043ND_GPIO_RTL8366_SDA   18
+#define TL_WR1043ND_GPIO_RTL8366_SCK   19
+
+#define TL_WR1043ND_KEYS_POLL_INTERVAL 20      /* msecs */
+#define TL_WR1043ND_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR1043ND_KEYS_POLL_INTERVAL)
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition tl_wr1043nd_partitions[] = {
@@ -39,20 +43,20 @@ static struct mtd_partition tl_wr1043nd_partitions[] = {
                .offset         = 0,
                .size           = 0x020000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "kernel",
                .offset         = 0x020000,
                .size           = 0x140000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x160000,
                .size           = 0x690000,
-       } , {
+       }, {
                .name           = "art",
                .offset         = 0x7f0000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "firmware",
                .offset         = 0x020000,
                .size           = 0x7d0000,
@@ -87,36 +91,48 @@ static struct gpio_led tl_wr1043nd_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button tl_wr1043nd_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tl_wr1043nd_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .debounce_interval = TL_WR1043ND_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WR1043ND_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 5,
+               .code           = KEY_WPS_BUTTON,
+               .debounce_interval = TL_WR1043ND_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WR1043ND_GPIO_BTN_QSS,
                .active_low     = 1,
        }
 };
 
+static struct rtl8366rb_platform_data tl_wr1043nd_rtl8366rb_data = {
+       .gpio_sda        = TL_WR1043ND_GPIO_RTL8366_SDA,
+       .gpio_sck        = TL_WR1043ND_GPIO_RTL8366_SCK,
+};
+
+static struct platform_device tl_wr1043nd_rtl8366rb_device = {
+       .name           = RTL8366RB_DRIVER_NAME,
+       .id             = -1,
+       .dev = {
+               .platform_data  = &tl_wr1043nd_rtl8366rb_data,
+       }
+};
+
 static void __init tl_wr1043nd_setup(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+       u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_set_mac_base(mac);
-
-       ar71xx_add_device_mdio(0x0);
-
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
+       ar71xx_eth0_data.mii_bus_dev = &tl_wr1043nd_rtl8366rb_device.dev;
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
-       ar71xx_eth0_data.phy_mask = 0x0;
        ar71xx_eth0_data.speed = SPEED_1000;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
+       ar71xx_eth0_pll_data.pll_1000 = 0x1a000000;
 
        ar71xx_add_device_eth(0);
 
@@ -127,10 +143,14 @@ static void __init tl_wr1043nd_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr1043nd_leds_gpio),
                                        tl_wr1043nd_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, TL_WR1043ND_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(tl_wr1043nd_gpio_buttons),
-                                       tl_wr1043nd_gpio_buttons);
-       ar913x_add_device_wmac();
+       platform_device_register(&tl_wr1043nd_rtl8366rb_device);
+
+       ar71xx_register_gpio_keys_polled(-1, TL_WR1043ND_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(tl_wr1043nd_gpio_keys),
+                                        tl_wr1043nd_gpio_keys);
+
+       ar9xxx_add_device_wmac(eeprom, mac);
 }
 
-MIPS_MACHINE(AR71XX_MACH_TL_WR1043ND, "TP-LINK TL-WR1043ND", tl_wr1043nd_setup);
+MIPS_MACHINE(AR71XX_MACH_TL_WR1043ND, "TL-WR1043ND", "TP-LINK TL-WR1043ND",
+            tl_wr1043nd_setup);