X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f65d6ac4d9dd48b1a17071d7d454629740dd180c..d33e1ea7fdbff03a730162b0b830f147595bb390:/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
index d76a8b447..b84d9ed9f 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
@@ -29,9 +29,9 @@
 #define DIR_300B_GPIO_BUTTON_WPS	0	/* active low */
 #define DIR_300B_GPIO_BUTTON_RESET	10	/* active low */
 
-#define DIR_300B_BUTTONS_POLL_INTERVAL	20
+#define DIR_300B_KEYS_POLL_INTERVAL	20
+#define DIR_300B_KEYS_DEBOUNCE_INTERVAL	(3 * DIR_300B_KEYS_POLL_INTERVAL)
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition dir_300b_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -51,55 +51,52 @@ static struct mtd_partition dir_300b_partitions[] = {
 	}, {
 		.name	= "kernel",
 		.offset	= 0x050000,
-		.size	= 0x0f0000,
+		.size	= 0x0d0000,
 	}, {
 		.name	= "rootfs",
-		.offset	= 0x140000,
-		.size	= 0x2B0000,
+		.offset	= 0x120000,
+		.size	= 0x2e0000,
 	}, {
 		.name	= "firmware",
 		.offset	= 0x050000,
-		.size	= 0x3a0000,
+		.size	= 0x3b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data dir_300b_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(dir_300b_partitions),
 	.parts		= dir_300b_partitions,
-#endif
 };
 
 static struct gpio_led dir_300b_leds_gpio[] __initdata = {
 	{
-		.name		= "dir-300b:amber:status",
+		.name		= "d-link:amber:status",
 		.gpio		= DIR_300B_GPIO_LED_STATUS_AMBER,
 		.active_low	= 1,
 	}, {
-		.name		= "dir-300b:green:status",
+		.name		= "d-link:green:status",
 		.gpio		= DIR_300B_GPIO_LED_STATUS_GREEN,
 		.active_low	= 1,
 	}, {
-		.name		= "dir-300b:blue:wps",
+		.name		= "d-link:blue:wps",
 		.gpio		= DIR_300B_GPIO_LED_WPS,
 		.active_low	= 1,
 	}
 };
 
-static struct gpio_button dir_300b_gpio_buttons[] __initdata = {
+static struct gpio_keys_button dir_300b_gpio_buttons[] __initdata = {
 	{
 		.desc		= "reset",
 		.type		= EV_KEY,
 		.code		= KEY_RESTART,
-		.threshold	= 3,
+		.debounce_interval = DIR_300B_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= DIR_300B_GPIO_BUTTON_RESET,
 		.active_low	= 1,
 	}, {
 		.desc		= "wps",
 		.type		= EV_KEY,
 		.code		= KEY_WPS_BUTTON,
-		.threshold	= 3,
+		.debounce_interval = DIR_300B_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= DIR_300B_GPIO_BUTTON_WPS,
 		.active_low	= 1,
 	}
@@ -110,15 +107,22 @@ static void __init dir_300b_init(void)
 	rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
 	rt305x_register_flash(0, &dir_300b_flash_data);
+	rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;
 	rt305x_register_ethernet();
 	ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_300b_leds_gpio),
 				  dir_300b_leds_gpio);
-	ramips_register_gpio_buttons(-1, DIR_300B_BUTTONS_POLL_INTERVAL,
+	ramips_register_gpio_buttons(-1, DIR_300B_KEYS_POLL_INTERVAL,
 				     ARRAY_SIZE(dir_300b_gpio_buttons),
 				     dir_300b_gpio_buttons);
 	rt305x_register_wifi();
 	rt305x_register_wdt();
 }
 
-MIPS_MACHINE(RAMIPS_MACH_DIR_300_REVB, "DIR-300-revB", "D-Link DIR-300 revB",
+MIPS_MACHINE(RAMIPS_MACH_DIR_300_B1, "DIR-300-B1", "D-Link DIR-300 B1",
+	     dir_300b_init);
+
+MIPS_MACHINE(RAMIPS_MACH_DIR_600_B1, "DIR-600-B1", "D-Link DIR-600 B1",
+	     dir_300b_init);
+
+MIPS_MACHINE(RAMIPS_MACH_DIR_600_B2, "DIR-600-B2", "D-Link DIR-600 B2",
 	     dir_300b_init);