X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Fath79%2Fmach-zcn-1523h.c;h=bc79ab9953f711fec631caa7d43b694a51db154c;hb=HEAD;hp=af6db6ad60220d84ce8dcce64fbdc870a7c67213;hpb=9a739d9ee5aa5e4ec72d6927085dba288ef882b6;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c
index af6db6ad60..bc79ab9953 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c
@@ -8,9 +8,6 @@
  *  by the Free Software Foundation.
  */
 
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
 #include <asm/mach-ath79/ath79.h>
 #include <asm/mach-ath79/ar71xx_regs.h>
 
@@ -30,7 +27,7 @@
 #define ZCN_1523H_2_GPIO_LED_MEDIUM	14
 #define ZCN_1523H_2_GPIO_LED_STRONG	15
 
-#define ZCN_1523H_5_GPIO_LED_UNKNOWN	1
+#define ZCN_1523H_5_GPIO_LAN2_POWER	1
 #define ZCN_1523H_5_GPIO_LED_LAN2	13
 #define ZCN_1523H_5_GPIO_LED_WEAK	14
 #define ZCN_1523H_5_GPIO_LED_MEDIUM	15
@@ -39,52 +36,6 @@
 #define ZCN_1523H_KEYS_POLL_INTERVAL	20	/* msecs */
 #define ZCN_1523H_KEYS_DEBOUNCE_INTERVAL (3 * ZCN_1523H_KEYS_POLL_INTERVAL)
 
-static struct mtd_partition zcn_1523h_partitions[] = {
-	{
-		.name		= "u-boot",
-		.offset		= 0,
-		.size		= 0x040000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "u-boot-env",
-		.offset		= 0x040000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "rootfs",
-		.offset		= 0x050000,
-		.size		= 0x610000,
-	}, {
-		.name		= "kernel",
-		.offset		= 0x660000,
-		.size		= 0x170000,
-	}, {
-		.name		= "configure",
-		.offset		= 0x7d0000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "mfg",
-		.offset		= 0x7e0000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "eeprom",
-		.offset		= 0x7f0000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "firmware",
-		.offset		= 0x050000,
-		.size		= 0x780000,
-	}
-};
-
-static struct flash_platform_data zcn_1523h_flash_data = {
-	.parts		= zcn_1523h_partitions,
-	.nr_parts	= ARRAY_SIZE(zcn_1523h_partitions),
-};
-
 static struct gpio_keys_button zcn_1523h_gpio_keys[] __initdata = {
 	{
 		.desc		= "reset",
@@ -141,9 +92,6 @@ static struct gpio_led zcn_1523h_5_leds_gpio[] __initdata = {
 		.name		= "zcn-1523h:green:lan2",
 		.gpio		= ZCN_1523H_5_GPIO_LED_LAN2,
 		.active_low	= 1,
-	}, {
-		.name		= "zcn-1523h:amber:unknown",
-		.gpio		= ZCN_1523H_5_GPIO_LED_UNKNOWN,
 	}
 };
 
@@ -158,7 +106,7 @@ static void __init zcn_1523h_generic_setup(void)
 				    AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
 				    AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
 
-	ath79_register_m25p80(&zcn_1523h_flash_data);
+	ath79_register_m25p80(NULL);
 
 	ath79_register_leds_gpio(0, ARRAY_SIZE(zcn_1523h_leds_gpio),
 					zcn_1523h_leds_gpio);