add feature gpio

[lede.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-esr-9753.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-esr-9753.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-esr-9753.c
index 88043a01d7824fe82cdf923c3bc5a455690bf1d2..d5f65df5ec5491ec7f3fe106b6f1784557a6e5a1 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-esr-9753.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-esr-9753.c
@@ -10,9 +10,6 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
 
 #include <asm/mach-ralink/machine.h>
 #include <asm/mach-ralink/dev-gpio-buttons.h>
@@ -28,47 +25,8 @@
 #define ESR_9753_GPIO_BUTTON_WPS       0       /* active low */
 #define ESR_9753_GPIO_BUTTON_RESET     10      /* active low */
 
-#define ESR_9753_BUTTONS_POLL_INTERVAL 20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition esr_9753_partitions[] = {
-       {
-               .name   = "u-boot",
-               .offset = 0,
-               .size   = 0x030000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "u-boot-env",
-               .offset = 0x030000,
-               .size   = 0x010000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "factory",
-               .offset = 0x040000,
-               .size   = 0x010000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "kernel",
-               .offset = 0x050000,
-               .size   = 0x0a0000,
-       }, {
-               .name   = "rootfs",
-               .offset = 0x150000,
-               .size   = 0x2b0000,
-       }, {
-               .name   = "firmware",
-               .offset = 0x050000,
-               .size   = 0x3b0000,
-       }
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data esr_9753_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-       .nr_parts       = ARRAY_SIZE(esr_9753_partitions),
-       .parts          = esr_9753_partitions,
-#endif
-};
+#define ESR_9753_KEYS_POLL_INTERVAL    20
+#define ESR_9753_KEYS_DEBOUNCE_INTERVAL        (3 * ESR_9753_KEYS_POLL_INTERVAL)
 
 static struct gpio_led esr_9753_leds_gpio[] __initdata = {
        {
@@ -82,19 +40,19 @@ static struct gpio_led esr_9753_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button esr_9753_gpio_buttons[] __initdata = {
+static struct gpio_keys_button esr_9753_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = ESR_9753_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = ESR_9753_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = ESR_9753_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = ESR_9753_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }
@@ -104,12 +62,12 @@ static void __init esr_9753_init(void)
 {
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
-       rt305x_register_flash(0, &esr_9753_flash_data);
+       rt305x_register_flash(0);
 
        ramips_register_gpio_leds(-1, ARRAY_SIZE(esr_9753_leds_gpio),
                                  esr_9753_leds_gpio);
 
-       ramips_register_gpio_buttons(-1, ESR_9753_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, ESR_9753_KEYS_POLL_INTERVAL,
                                     ARRAY_SIZE(esr_9753_gpio_buttons),
                                     esr_9753_gpio_buttons);