X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2e12b6720fec67b925f00dcec535113ce2b9f714..37f21ebf4dc5e1552b8757c25c44a586f678d1bc:/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
index 37fc6fd43..ce328988e 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
@@ -31,9 +31,9 @@
 #define HW550_3G_GPIO_BUTTON_CONNECT	7
 #define HW550_3G_GPIO_BUTTON_WPS	0
 
-#define HW550_3G_BUTTONS_POLL_INTERVAL	20
+#define HW550_3G_KEYS_POLL_INTERVAL	20
+#define HW550_3G_KEYS_DEBOUNCE_INTERVAL	(3 * HW550_3G_KEYS_POLL_INTERVAL)
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition hw550_3g_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -53,29 +53,17 @@ static struct mtd_partition hw550_3g_partitions[] = {
 	}, {
 		.name	= "kernel",
 		.offset	= 0x050000,
-		.size	= 0x180000,
+		.size	= 0x0d0000,
 	}, {
 		.name	= "rootfs",
-		.offset	= 0x1d0000,
-		.size	= 0x580000,
-	}, {
-		.name	= "user",
-		.offset	= 0x750000,
-		.size	= 0x0b0000,
+		.offset	= 0x120000,
+		.size	= 0x6e0000,
 	}, {
 		.name	= "firmware",
 		.offset	= 0x050000,
-		.size	= 0x700000,
+		.size	= 0x7b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data hw550_3g_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.nr_parts	= ARRAY_SIZE(hw550_3g_partitions),
-	.parts		= hw550_3g_partitions,
-#endif
-};
 
 static struct gpio_led hw550_3g_leds_gpio[] __initdata = {
 	{
@@ -97,26 +85,26 @@ static struct gpio_led hw550_3g_leds_gpio[] __initdata = {
 	}
 };
 
-static struct gpio_button hw550_3g_gpio_buttons[] __initdata = {
+static struct gpio_keys_button hw550_3g_gpio_buttons[] __initdata = {
 	{
 		.desc		= "reset",
 		.type		= EV_KEY,
 		.code		= KEY_RESTART,
-		.threshold	= 3,
+		.debounce_interval = HW550_3G_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= HW550_3G_GPIO_BUTTON_RESET,
 		.active_low	= 1,
 	}, {
 		.desc		= "connect",
 		.type		= EV_KEY,
 		.code		= KEY_CONNECT,
-		.threshold	= 3,
+		.debounce_interval = HW550_3G_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= HW550_3G_GPIO_BUTTON_CONNECT,
 		.active_low	= 1,
 	}, {
 		.desc		= "wps",
 		.type		= EV_KEY,
 		.code		= KEY_WPS_BUTTON,
-		.threshold	= 3,
+		.debounce_interval = HW550_3G_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= HW550_3G_GPIO_BUTTON_WPS,
 		.active_low	= 1,
 	}
@@ -130,15 +118,20 @@ static void __init hw550_3g_init(void)
 {
 	rt305x_gpio_init(HW550_3G_GPIO_MODE);
 
-	rt305x_register_flash(0, &hw550_3g_flash_data);
+	rt305x_flash0_data.nr_parts = ARRAY_SIZE(hw550_3g_partitions);
+	rt305x_flash0_data.parts = hw550_3g_partitions;
+	rt305x_register_flash(0);
+
+       rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_WLLLL;
 	rt305x_register_ethernet();
 	ramips_register_gpio_leds(-1, ARRAY_SIZE(hw550_3g_leds_gpio),
 				  hw550_3g_leds_gpio);
-	ramips_register_gpio_buttons(-1, HW550_3G_BUTTONS_POLL_INTERVAL,
+	ramips_register_gpio_buttons(-1, HW550_3G_KEYS_POLL_INTERVAL,
 				     ARRAY_SIZE(hw550_3g_gpio_buttons),
 				     hw550_3g_gpio_buttons);
 	rt305x_register_wifi();
 	rt305x_register_wdt();
+	rt305x_register_usb();
 }
 
 MIPS_MACHINE(RAMIPS_MACH_HW550_3G, "HW550-3G", "Aztech HW550-3G",