From e27017a7280e64c09b8e74e702610e7a6688a130 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 27 Mar 2012 19:38:01 +0000
Subject: ar71xx: remove the built-in MTD maps of several boards

We are passing the MTD layout via the kernel command line, so
it makes no sense to duplicate it in mach-* files. The patch
removes the built-in MTD maps of the following boards:

 * AP113
 * ALFA N2/N5
 * DIR-600
 * DIR-615
 * DIR-825
 * TEW-6{3,5}2BRP
 * TEW-673GRU
 * WHR-G301N
 * WHR-HP-GN
 * WHR-HP-G300N

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31108 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c | 37 +---------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

(limited to 'target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c')

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c
index ab973ebfb..1b4b49075 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c
@@ -11,8 +11,6 @@
  */
 
 #include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/rtl8366.h>
 
@@ -48,39 +46,6 @@
 #define DIR825B1_MAC_LOCATION_0			0x1f66ffa0
 #define DIR825B1_MAC_LOCATION_1			0x1f66ffb4
 
-static struct mtd_partition dir825b1_partitions[] = {
-	{
-		.name		= "uboot",
-		.offset		= 0,
-		.size		= 0x040000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "config",
-		.offset		= 0x040000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "firmware",
-		.offset		= 0x050000,
-		.size		= 0x610000,
-	}, {
-		.name		= "caldata",
-		.offset		= 0x660000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "unknown",
-		.offset		= 0x670000,
-		.size		= 0x190000,
-		.mask_flags	= MTD_WRITEABLE,
-	}
-};
-
-static struct flash_platform_data dir825b1_flash_data = {
-	.parts          = dir825b1_partitions,
-	.nr_parts       = ARRAY_SIZE(dir825b1_partitions),
-};
-
 static struct gpio_led dir825b1_leds_gpio[] __initdata = {
 	{
 		.name		= "d-link:blue:usb",
@@ -184,7 +149,7 @@ static void __init dir825b1_setup(void)
 	ath79_register_eth(0);
 	ath79_register_eth(1);
 
-	ath79_register_m25p80(&dir825b1_flash_data);
+	ath79_register_m25p80(NULL);
 
 	ath79_register_leds_gpio(-1, ARRAY_SIZE(dir825b1_leds_gpio),
 				 dir825b1_leds_gpio);
-- 
cgit v1.2.3