aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-27 19:38:01 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-27 19:38:01 +0000
commit87e4ec687b393c84de13906220a2dcfb2d3fe9ca (patch)
treeb47130c3bd24678ca41c93435e058f619a1bf436 /target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c
parente6b685650ba6f88539cf651b72bbe3a14144eda5 (diff)
downloadupstream-87e4ec687b393c84de13906220a2dcfb2d3fe9ca.tar.gz
upstream-87e4ec687b393c84de13906220a2dcfb2d3fe9ca.tar.bz2
upstream-87e4ec687b393c84de13906220a2dcfb2d3fe9ca.zip
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 SVN-Revision: 31108
Diffstat (limited to 'target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c45
1 files changed, 1 insertions, 44 deletions
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 3e3924b877..48f49ad0f7 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 |