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
---
 .../files/arch/mips/ath79/mach-whr-hp-g300n.c      | 45 +---------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

(limited to 'target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c')

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c
index 3e3924b87..48f49ad0f 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c
@@ -12,9 +12,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>
 
@@ -45,46 +42,6 @@
 
 #define WHRHPG300N_MAC_OFFSET		0x20c
 
-static struct mtd_partition whrhpg300n_partitions[] = {
-	{
-		.name		= "u-boot",
-		.offset		= 0,
-		.size		= 0x03e000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "u-boot-env",
-		.offset		= 0x03e000,
-		.size		= 0x002000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "kernel",
-		.offset		= 0x040000,
-		.size		= 0x0e0000,
-	}, {
-		.name		= "rootfs",
-		.offset		= 0x120000,
-		.size		= 0x2c0000,
-	}, {
-		.name		= "user_property",
-		.offset		= 0x3e0000,
-		.size		= 0x010000,
-	}, {
-		.name		= "ART",
-		.offset		= 0x3f0000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "firmware",
-		.offset		= 0x040000,
-		.size		= 0x3a0000,
-	}
-};
-
-static struct flash_platform_data whrhpg300n_flash_data = {
-	.parts		= whrhpg300n_partitions,
-	.nr_parts	= ARRAY_SIZE(whrhpg300n_partitions),
-};
-
 static struct gpio_led whrhpg300n_leds_gpio[] __initdata = {
 	{
 		.name		= "buffalo:orange:security",
@@ -158,7 +115,7 @@ static void __init whrhpg300n_setup(void)
 	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
 	u8 *mac = (u8 *) KSEG1ADDR(ee + WHRHPG300N_MAC_OFFSET);
 
-	ath79_register_m25p80(&whrhpg300n_flash_data);
+	ath79_register_m25p80(NULL);
 
 	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
 				    AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
-- 
cgit v1.2.3