X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bf5f735641b53a1e47871f8aa04d2956a427c3bc..3b5a6363a0cebe502193f0af8954caf8db8c52f5:/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c
index e34509275..a433e40e9 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c
@@ -11,9 +11,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>
@@ -29,47 +26,8 @@
 #define FONERA20N_GPIO_LED_POWER	9
 #define FONERA20N_GPIO_LED_USB		14
 
-#define FONERA20N_BUTTONS_POLL_INTERVAL	20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition fonera20n_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	= 0x6b0000,
-	}, {
-		.name	= "firmware",
-		.offset	= 0x050000,
-		.size	= 0x7b0000,
-	}
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data fonera20n_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.nr_parts	= ARRAY_SIZE(fonera20n_partitions),
-	.parts		= fonera20n_partitions,
-#endif
-};
+#define FONERA20N_KEYS_POLL_INTERVAL	20
+#define FONERA20N_KEYS_DEBOUNCE_INTERVAL (3 * FONERA20N_KEYS_POLL_INTERVAL)
 
 static struct gpio_led fonera20n_leds_gpio[] __initdata = {
 	{
@@ -87,19 +45,19 @@ static struct gpio_led fonera20n_leds_gpio[] __initdata = {
 	}
 };
 
-static struct gpio_button fonera20n_gpio_buttons[] __initdata = {
+static struct gpio_keys_button fonera20n_gpio_buttons[] __initdata = {
 	{
 		.desc		= "reset",
 		.type		= EV_KEY,
 		.code		= KEY_RESTART,
-		.threshold	= 3,
+		.debounce_interval = FONERA20N_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= FONERA20N_GPIO_BUTTON_RESET,
 		.active_low	= 1,
 	}, {
 		.desc		= "switch",
 		.type		= EV_KEY,
 		.code		= BTN_1,
-		.threshold	= 3,
+		.debounce_interval = FONERA20N_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= FONERA20N_GPIO_SWITCH,
 		.active_low	= 1,
 	}
@@ -109,12 +67,12 @@ static void __init fonera20n_init(void)
 {
 	rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
-	rt305x_register_flash(0, &fonera20n_flash_data);
+	rt305x_register_flash(0);
 
 	ramips_register_gpio_leds(-1, ARRAY_SIZE(fonera20n_leds_gpio),
 				  fonera20n_leds_gpio);
 
-	ramips_register_gpio_buttons(-1, FONERA20N_BUTTONS_POLL_INTERVAL,
+	ramips_register_gpio_buttons(-1, FONERA20N_KEYS_POLL_INTERVAL,
 				     ARRAY_SIZE(fonera20n_gpio_buttons),
 				     fonera20n_gpio_buttons);