X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Far71xx%2Fmach-tl-wr1043nd.c;h=3a844b774019f4dfda91fb13909c6791179ca6b3;hb=11a837ce029534fc38f6deb2a2f31d80fe5a1f7f;hp=e4de9d50c1474d88c273ccea9d5b726b9e66970b;hpb=2be7aaf5c2ead7dc38a48c6320f1ad8413e73ea6;p=openwrt.git

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
index e4de9d50c1..3a844b7740 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
@@ -8,10 +8,8 @@
  *  by the Free Software Foundation.
  */
 
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
-#include <linux/rtl8366rb.h>
+#include <linux/rtl8366.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 
 #include "machtype.h"
@@ -33,82 +31,57 @@
 #define TL_WR1043ND_GPIO_RTL8366_SDA	18
 #define TL_WR1043ND_GPIO_RTL8366_SCK	19
 
-#define TL_WR1043ND_BUTTONS_POLL_INTERVAL     20
+#define TL_WR1043ND_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR1043ND_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR1043ND_KEYS_POLL_INTERVAL)
 
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition tl_wr1043nd_partitions[] = {
-	{
-		.name		= "u-boot",
-		.offset		= 0,
-		.size		= 0x020000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "kernel",
-		.offset		= 0x020000,
-		.size		= 0x140000,
-	}, {
-		.name		= "rootfs",
-		.offset		= 0x160000,
-		.size		= 0x690000,
-	}, {
-		.name		= "art",
-		.offset		= 0x7f0000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "firmware",
-		.offset		= 0x020000,
-		.size		= 0x7d0000,
-	}
+static const char *tl_wr1043nd_part_probes[] = {
+	"tp-link",
+	NULL,
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct flash_platform_data tl_wr1043nd_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.parts		= tl_wr1043nd_partitions,
-	.nr_parts	= ARRAY_SIZE(tl_wr1043nd_partitions),
-#endif
+	.part_probes	= tl_wr1043nd_part_probes,
 };
 
 static struct gpio_led tl_wr1043nd_leds_gpio[] __initdata = {
 	{
-		.name		= "tl-wr1043nd:green:usb",
+		.name		= "tp-link:green:usb",
 		.gpio		= TL_WR1043ND_GPIO_LED_USB,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-wr1043nd:green:system",
+		.name		= "tp-link:green:system",
 		.gpio		= TL_WR1043ND_GPIO_LED_SYSTEM,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-wr1043nd:green:qss",
+		.name		= "tp-link:green:qss",
 		.gpio		= TL_WR1043ND_GPIO_LED_QSS,
 		.active_low	= 0,
 	}, {
-		.name		= "tl-wr1043nd:green:wlan",
+		.name		= "tp-link:green:wlan",
 		.gpio		= TL_WR1043ND_GPIO_LED_WLAN,
 		.active_low	= 1,
 	}
 };
 
-static struct gpio_button tl_wr1043nd_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tl_wr1043nd_gpio_keys[] __initdata = {
 	{
 		.desc		= "reset",
 		.type		= EV_KEY,
 		.code		= KEY_RESTART,
-		.threshold	= 3,
+		.debounce_interval = TL_WR1043ND_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= TL_WR1043ND_GPIO_BTN_RESET,
 		.active_low	= 1,
 	}, {
 		.desc		= "qss",
 		.type		= EV_KEY,
 		.code		= KEY_WPS_BUTTON,
-		.threshold	= 3,
+		.debounce_interval = TL_WR1043ND_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= TL_WR1043ND_GPIO_BTN_QSS,
 		.active_low	= 1,
 	}
 };
 
-static struct rtl8366rb_platform_data tl_wr1043nd_rtl8366rb_data = {
+static struct rtl8366_platform_data tl_wr1043nd_rtl8366rb_data = {
 	.gpio_sda        = TL_WR1043ND_GPIO_RTL8366_SDA,
 	.gpio_sck        = TL_WR1043ND_GPIO_RTL8366_SCK,
 };
@@ -144,9 +117,9 @@ static void __init tl_wr1043nd_setup(void)
 
 	platform_device_register(&tl_wr1043nd_rtl8366rb_device);
 
-	ar71xx_add_device_gpio_buttons(-1, TL_WR1043ND_BUTTONS_POLL_INTERVAL,
-					ARRAY_SIZE(tl_wr1043nd_gpio_buttons),
-					tl_wr1043nd_gpio_buttons);
+	ar71xx_register_gpio_keys_polled(-1, TL_WR1043ND_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(tl_wr1043nd_gpio_keys),
+					 tl_wr1043nd_gpio_keys);
 
 	ar9xxx_add_device_wmac(eeprom, mac);
 }