ramips: rt305x: remove per-board physmap_flash_data instances

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

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
index 6dee249..cbbf730 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
@@ -27,7 +27,8 @@
 #define V22RW_2X2_GPIO_LED_SECURITY    13
 #define V22RW_2X2_GPIO_LED_WPS         14
 
-#define V22RW_2X2_BUTTONS_POLL_INTERVAL        20
+#define V22RW_2X2_KEYS_POLL_INTERVAL   20
+#define V22RW_2X2_KEYS_DEBOUNCE_INTERVAL (3 * V22RW_2X2_KEYS_POLL_INTERVAL)
 
 static struct mtd_partition v22rw_2x2_partitions[] = {
        {
@@ -60,11 +61,6 @@ static struct mtd_partition v22rw_2x2_partitions[] = {
        }
 };
 
-static struct physmap_flash_data v22rw_2x2_flash_data = {
-       .nr_parts       = ARRAY_SIZE(v22rw_2x2_partitions),
-       .parts          = v22rw_2x2_partitions,
-};
-
 static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = {
        {
                .name           = "v22rw-2x2:green:security",
@@ -77,19 +73,19 @@ static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button v22rw_2x2_gpio_buttons[] __initdata = {
+static struct gpio_keys_button v22rw_2x2_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = V22RW_2X2_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = V22RW_2X2_GPIO_BUTTON_SWRST,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = V22RW_2X2_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = V22RW_2X2_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }
@@ -99,12 +95,15 @@ static void __init v22rw_2x2_init(void)
 {
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
-       rt305x_register_flash(0, &v22rw_2x2_flash_data);
+       rt305x_flash0_data.nr_parts = ARRAY_SIZE(v22rw_2x2_partitions);
+       rt305x_flash0_data.parts = v22rw_2x2_partitions;
+       rt305x_register_flash(0);
+
        rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(v22rw_2x2_leds_gpio),
                                  v22rw_2x2_leds_gpio);
-       ramips_register_gpio_buttons(-1, V22RW_2X2_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, V22RW_2X2_KEYS_POLL_INTERVAL,
                                     ARRAY_SIZE(v22rw_2x2_gpio_buttons),
                                     v22rw_2x2_gpio_buttons);
        rt305x_register_wifi();