X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ed0adccdff830edd942edcb55bcc16456f039ddb..b1b7fcb8bd1fd7c4bfebbb94ed5087e1856e104e:/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c
index 6a400424c..0834c137d 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c
@@ -14,7 +14,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 
-#include <linux/rtl8366rb.h>
+#include <linux/rtl8366.h>
 
 #include <asm/mach-ralink/machine.h>
 #include <asm/mach-ralink/dev-gpio-buttons.h>
@@ -35,43 +35,43 @@
 #define F5D8235_V2_GPIO_LED_SECURITY_AMBER	12
 
 static struct gpio_led f5d8235v2_leds_gpio[] __initdata = {
-        {
-                .name           = "f5d8235v2:blue:internet",
-                .gpio           = F5D8235_V2_GPIO_LED_INTERNET_BLUE,
-                .active_low     = 1,
-        }, {
-                .name           = "f5d8235v2:amber:internet",
-                .gpio           = F5D8235_V2_GPIO_LED_INTERNET_AMBER,
-                .active_low     = 1,
-        }, {
-                .name           = "f5d8235v2:blue:modem",
-                .gpio           = F5D8235_V2_GPIO_LED_MODEM_BLUE,
-                .active_low     = 1,
-        }, {
-                .name           = "f5d8235v2:amber:modem",
-                .gpio           = F5D8235_V2_GPIO_LED_MODEM_AMBER,
-                .active_low     = 1,
-        }, {
-                .name           = "f5d8235v2:blue:router",
-                .gpio           = F5D8235_V2_GPIO_LED_ROUTER,
-                .active_low     = 1,
-        }, {
-                .name           = "f5d8235v2:blue:storage",
-                .gpio           = F5D8235_V2_GPIO_LED_STORAGE_BLUE,
-                .active_low     = 1,
-        }, {
-                .name           = "f5d8235v2:amber:storage",
-                .gpio           = F5D8235_V2_GPIO_LED_STORAGE_AMBER,
-                .active_low     = 1,
-        }, {
-                .name           = "f5d8235v2:blue:security",
-                .gpio           = F5D8235_V2_GPIO_LED_SECURITY_BLUE,
-                .active_low     = 1,
-        }, {
-                .name           = "f5d8235v2:amber:security",
-                .gpio           = F5D8235_V2_GPIO_LED_SECURITY_AMBER,
-                .active_low     = 1,
-        }
+	{
+		.name		= "f5d8235v2:blue:internet",
+		.gpio		= F5D8235_V2_GPIO_LED_INTERNET_BLUE,
+		.active_low	= 1,
+	}, {
+		.name		= "f5d8235v2:amber:internet",
+		.gpio		= F5D8235_V2_GPIO_LED_INTERNET_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "f5d8235v2:blue:modem",
+		.gpio		= F5D8235_V2_GPIO_LED_MODEM_BLUE,
+		.active_low	= 1,
+	}, {
+		.name		= "f5d8235v2:amber:modem",
+		.gpio		= F5D8235_V2_GPIO_LED_MODEM_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "f5d8235v2:blue:router",
+		.gpio		= F5D8235_V2_GPIO_LED_ROUTER,
+		.active_low	= 1,
+	}, {
+		.name		= "f5d8235v2:blue:storage",
+		.gpio		= F5D8235_V2_GPIO_LED_STORAGE_BLUE,
+		.active_low	= 1,
+	}, {
+		.name		= "f5d8235v2:amber:storage",
+		.gpio		= F5D8235_V2_GPIO_LED_STORAGE_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "f5d8235v2:blue:security",
+		.gpio		= F5D8235_V2_GPIO_LED_SECURITY_BLUE,
+		.active_low	= 1,
+	}, {
+		.name		= "f5d8235v2:amber:security",
+		.gpio		= F5D8235_V2_GPIO_LED_SECURITY_AMBER,
+		.active_low	= 1,
+	}
 };
 
 #ifdef CONFIG_MTD_PARTITIONS
@@ -109,17 +109,17 @@ static struct physmap_flash_data f5d8235v2_flash_data = {
 };
 
 
-static struct rtl8366rb_platform_data f5d8235v2_switch_data = {
-	.gpio_sda        = RT305X_GPIO_I2C_SD,
-	.gpio_sck        = RT305X_GPIO_I2C_SCLK,
+static struct rtl8366_platform_data f5d8235v2_switch_data = {
+	.gpio_sda	= RT305X_GPIO_I2C_SD,
+	.gpio_sck	= RT305X_GPIO_I2C_SCLK,
 };
 
 static struct platform_device f5d8235v2_switch = {
-        .name           = RTL8366RB_DRIVER_NAME,
+	.name		= RTL8366RB_DRIVER_NAME,
 	.id		= -1,
-        .dev		= {
-	    .platform_data = &f5d8235v2_switch_data,
-        }
+	.dev		= {
+		.platform_data = &f5d8235v2_switch_data,
+	}
 };
 
 static void __init f5d8235v2_init(void)
@@ -132,9 +132,12 @@ static void __init f5d8235v2_init(void)
 	rt305x_register_flash(0, &f5d8235v2_flash_data);
 	ramips_register_gpio_leds(-1, ARRAY_SIZE(f5d8235v2_leds_gpio),
 						f5d8235v2_leds_gpio);
+	rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_NONE;
 	rt305x_register_ethernet();
 	platform_device_register(&f5d8235v2_switch);
 	rt305x_register_wifi();
+	rt305x_register_wdt();
+	rt305x_register_usb();
 }
 
 MIPS_MACHINE(RAMIPS_MACH_F5D8235_V2, "F5D8235_V2", "Belkin F5D8235 v2",