ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
index 7b1ee90aef83c0fe02ad3d779510777ccdb03491..15bc05535dd8cef7d2533cbde73ddf8d1b933109 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
@@ -38,7 +38,8 @@
 #define WNDR3700_GPIO_RTL8366_SDA      5
 #define WNDR3700_GPIO_RTL8366_SCK      7
 
-#define WNDR3700_BUTTONS_POLL_INTERVAL    20
+#define WNDR3700_KEYS_POLL_INTERVAL    20      /* msecs */
+#define WNDR3700_KEYS_DEBOUNCE_INTERVAL (3 * WNDR3700_KEYS_POLL_INTERVAL)
 
 #define WNDR3700_ETH0_MAC_OFFSET       0
 #define WNDR3700_ETH1_MAC_OFFSET       0x6
@@ -96,14 +97,64 @@ static struct mtd_partition wndr3700_partitions[] = {
                .mask_flags     = MTD_WRITEABLE,
        }
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
-static struct flash_platform_data wndr3700_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-       .parts          = wndr3700_partitions,
-       .nr_parts       = ARRAY_SIZE(wndr3700_partitions),
-#endif
+static struct mtd_partition wndr3700v2_partitions[] = {
+       {
+               .name           = "uboot",
+               .offset         = 0,
+               .size           = 0x050000,
+               .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "env",
+               .offset         = 0x050000,
+               .size           = 0x020000,
+               .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "rootfs",
+               .offset         = 0x070000,
+               .size           = 0xe40000,
+       }, {
+               .name           = "config",
+               .offset         = 0xeb0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "config_bak",
+               .offset         = 0xec0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "pot",
+               .offset         = 0xed0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "traffic_meter",
+               .offset         = 0xee0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "language",
+               .offset         = 0xef0000,
+               .size           = 0x100000,
+               .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "caldata",
+               .offset         = 0xff0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       }
 };
+#define wndr3700_num_partitions                ARRAY_SIZE(wndr3700_partitions)
+#define wndr3700v2_num_partitions      ARRAY_SIZE(wndr3700v2_partitions)
+#else
+#define wndr3700_partitions            NULL
+#define wndr3700_num_partitions                0
+#define wndr3700v2_partitions          NULL
+#define wndr3700v2_num_partitions      0
+#endif /* CONFIG_MTD_PARTITIONS */
+
+static struct flash_platform_data wndr3700_flash_data;
 
 static struct gpio_led wndr3700_leds_gpio[] __initdata = {
        {
@@ -129,26 +180,26 @@ static struct gpio_led wndr3700_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button wndr3700_gpio_buttons[] __initdata = {
+static struct gpio_keys_button wndr3700_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = WNDR3700_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WNDR3700_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = WNDR3700_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WNDR3700_GPIO_BTN_WPS,
                .active_low     = 1,
        }, {
                .desc           = "wifi",
                .type           = EV_KEY,
                .code           = BTN_2,
-               .threshold      = 3,
+               .debounce_interval = WNDR3700_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WNDR3700_GPIO_BTN_WIFI,
                .active_low     = 1,
        }
@@ -167,7 +218,7 @@ static struct platform_device wndr3700_rtl8366s_device = {
        }
 };
 
-static void __init wndr3700_setup(void)
+static void __init wndr3700_common_setup(void)
 {
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
 
@@ -196,9 +247,9 @@ static void __init wndr3700_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wndr3700_leds_gpio),
                                        wndr3700_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, WNDR3700_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(wndr3700_gpio_buttons),
-                                       wndr3700_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, WNDR3700_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(wndr3700_gpio_keys),
+                                        wndr3700_gpio_keys);
 
        platform_device_register(&wndr3700_rtl8366s_device);
        platform_device_register_simple("wndr3700-led-usb", -1, NULL, 0);
@@ -218,5 +269,22 @@ static void __init wndr3700_setup(void)
                      art + WNDR3700_WMAC1_MAC_OFFSET);
 }
 
+static void __init wndr3700_setup(void)
+{
+       wndr3700_flash_data.parts = wndr3700_partitions,
+       wndr3700_flash_data.nr_parts = wndr3700_num_partitions,
+       wndr3700_common_setup();
+}
+
 MIPS_MACHINE(AR71XX_MACH_WNDR3700, "WNDR3700", "NETGEAR WNDR3700",
             wndr3700_setup);
+
+static void __init wndr3700v2_setup(void)
+{
+       wndr3700_flash_data.parts = wndr3700v2_partitions,
+       wndr3700_flash_data.nr_parts = wndr3700v2_num_partitions,
+       wndr3700_common_setup();
+}
+
+MIPS_MACHINE(AR71XX_MACH_WNDR3700V2, "WNDR3700v2", "NETGEAR WNDR3700v2",
+            wndr3700v2_setup);