ramips: select HW_HAS_PCI on per-board basis

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

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl341v3.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl341v3.c
index a3c4485..34d9cfe 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl341v3.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl341v3.c
@@ -33,7 +33,8 @@
 #define WL341V3_GPIO_BUTTON_WPS                5       /* active low */
 #define WL341V3_GPIO_BUTTON_RESET      7       /* active low */
 
-#define WL341V3_BUTTONS_POLL_INTERVAL  20
+#define WL341V3_KEYS_POLL_INTERVAL     20
+#define WL341V3_KEYS_DEBOUNCE_INTERVAL (3 * WL341V3_KEYS_POLL_INTERVAL)
 
 static struct mtd_partition wl341v3_partitions[] = {
        {
@@ -74,11 +75,6 @@ static struct mtd_partition wl341v3_partitions[] = {
        }
 };
 
-static struct physmap_flash_data wl341v3_flash_data = {
-       .nr_parts       = ARRAY_SIZE(wl341v3_partitions),
-       .parts          = wl341v3_partitions,
-};
-
 static struct gpio_led wl341v3_leds_gpio[] __initdata = {
        {
                .name           = "wl341v3:amber:first",
@@ -111,19 +107,19 @@ static struct gpio_led wl341v3_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button wl341v3_gpio_buttons[] __initdata = {
+static struct gpio_keys_button wl341v3_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = WL341V3_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WL341V3_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = WL341V3_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WL341V3_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }
@@ -133,12 +129,15 @@ static void __init wl341v3_init(void)
 {
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
-       rt305x_register_flash(0, &wl341v3_flash_data);
+       rt305x_flash0_data.nr_parts = ARRAY_SIZE(wl341v3_partitions);
+       rt305x_flash0_data.parts = wl341v3_partitions;
+       rt305x_register_flash(0);
+
        rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_WLLLL;
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(wl341v3_leds_gpio),
                                  wl341v3_leds_gpio);
-       ramips_register_gpio_buttons(-1, WL341V3_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, WL341V3_KEYS_POLL_INTERVAL,
                                     ARRAY_SIZE(wl341v3_gpio_buttons),
                                     wl341v3_gpio_buttons);
        rt305x_register_wifi();