X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c44ee422c3f7fb736b69ded2793a3673d0e51266..ef3572beded6b144f1cb7e6e6ace7e8c7c42e803:/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 812dfb4a9..b5883bb99 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
@@ -55,7 +55,7 @@ static struct mtd_partition v22rw_2x2_partitions[] = {
 		.offset	= 0x150000,
 		.size	= 0x2b0000,
 	}, {
-		.name	= "openwrt",
+		.name	= "firmware",
 		.offset	= 0x050000,
 		.size	= 0x3b0000,
 	}
@@ -85,14 +85,14 @@ static struct gpio_button v22rw_2x2_gpio_buttons[] __initdata = {
 	{
 		.desc		= "reset",
 		.type		= EV_KEY,
-		.code		= BTN_0,
+		.code		= KEY_RESTART,
 		.threshold	= 3,
 		.gpio		= V22RW_2X2_GPIO_BUTTON_SWRST,
 		.active_low	= 1,
 	}, {
 		.desc		= "wps",
 		.type		= EV_KEY,
-		.code		= BTN_1,
+		.code		= KEY_WPS_BUTTON,
 		.threshold	= 3,
 		.gpio		= V22RW_2X2_GPIO_BUTTON_WPS,
 		.active_low	= 1,
@@ -104,6 +104,7 @@ 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_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);
@@ -111,6 +112,7 @@ static void __init v22rw_2x2_init(void)
 				     ARRAY_SIZE(v22rw_2x2_gpio_buttons),
 				     v22rw_2x2_gpio_buttons);
 	rt305x_register_wifi();
+	rt305x_register_wdt();
 }
 
 MIPS_MACHINE(RAMIPS_MACH_V22RW_2X2, "V22RW-2X2", "Ralink AP-RT3052-V22RW-2X2",