X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3e39b51297d963e7176afd8fa3072015abcdf657..3b5a6363a0cebe502193f0af8954caf8db8c52f5:/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 8c4d18214..7f43dabdc 100644
--- 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
@@ -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>
@@ -27,47 +24,8 @@
 #define V22RW_2X2_GPIO_LED_SECURITY	13
 #define V22RW_2X2_GPIO_LED_WPS		14
 
-#define V22RW_2X2_BUTTONS_POLL_INTERVAL	20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition v22rw_2x2_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	= "openwrt",
-		.offset	= 0x050000,
-		.size	= 0x3b0000,
-	}
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data v22rw_2x2_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.nr_parts	= ARRAY_SIZE(v22rw_2x2_partitions),
-	.parts		= v22rw_2x2_partitions,
-#endif
-};
+#define V22RW_2X2_KEYS_POLL_INTERVAL	20
+#define V22RW_2X2_KEYS_DEBOUNCE_INTERVAL (3 * V22RW_2X2_KEYS_POLL_INTERVAL)
 
 static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = {
 	{
@@ -81,19 +39,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,
 	}
@@ -103,14 +61,18 @@ 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_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();
+	rt305x_register_wdt();
+	rt305x_register_usb();
 }
 
 MIPS_MACHINE(RAMIPS_MACH_V22RW_2X2, "V22RW-2X2", "Ralink AP-RT3052-V22RW-2X2",