ramips: rt3883: add PCI support

[openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-nw718.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c
index 917357e..a287bc6 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c
@@ -32,7 +32,8 @@
 
 #define NW718_GPIO_SPI_CS0             3
 
 
 #define NW718_GPIO_SPI_CS0             3
 

-#define NW718_BUTTONS_POLL_INTERVAL    20
+#define NW718_KEYS_POLL_INTERVAL       20
+#define NW718_KEYS_DEBOUNCE_INTERVAL   (3 * NW718_KEYS_POLL_INTERVAL)

 
 static struct mtd_partition nw718_partitions[] = {
        {
 
 static struct mtd_partition nw718_partitions[] = {
        {


@@ -86,19 +87,19 @@ static struct gpio_led nw718_leds_gpio[] __initdata = {
        }
 };
 
        }
 };
 

-static struct gpio_button nw718_gpio_buttons[] __initdata = {
+static struct gpio_keys_button nw718_gpio_buttons[] __initdata = {

        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,

-               .threshold      = 3,
+               .debounce_interval = NW718_KEYS_DEBOUNCE_INTERVAL,

                .gpio           = NW718_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
                .gpio           = NW718_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,

-               .threshold      = 3,
+               .debounce_interval = NW718_KEYS_DEBOUNCE_INTERVAL,

                .gpio           = NW718_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }
                .gpio           = NW718_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }


@@ -124,7 +125,7 @@ static void __init nw718_init(void)
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(nw718_leds_gpio),
                                  nw718_leds_gpio);
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(nw718_leds_gpio),
                                  nw718_leds_gpio);

-       ramips_register_gpio_buttons(-1, NW718_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, NW718_KEYS_POLL_INTERVAL,

                                     ARRAY_SIZE(nw718_gpio_buttons),
                                     nw718_gpio_buttons);
        rt305x_register_wifi();
                                     ARRAY_SIZE(nw718_gpio_buttons),
                                     nw718_gpio_buttons);
        rt305x_register_wifi();