X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f019ef96de8c9d6af703469ae4e5ff4bde3f3f50..baa5c31303a689b7289a427be231195542e9fa6c:/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 b451723c1..6dee24944 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
@@ -29,7 +29,6 @@
 
 #define V22RW_2X2_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition v22rw_2x2_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -55,18 +54,15 @@ static struct mtd_partition v22rw_2x2_partitions[] = {
 		.offset	= 0x150000,
 		.size	= 0x2b0000,
 	}, {
-		.name	= "openwrt",
+		.name	= "firmware",
 		.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
 };
 
 static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = {
@@ -104,6 +100,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);
@@ -112,6 +109,7 @@ static void __init v22rw_2x2_init(void)
 				     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",