[MIPS] Malta: Resurrect MTD support for onboard flash.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 1 insertions, 40 deletions

diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile
index 77ee5c6d33c1..b662c75fb28e 100644
--- a/arch/mips/mips-boards/malta/Makefile
+++ b/arch/mips/mips-boards/malta/Makefile
@@ -19,5 +19,5 @@
 # under Linux.
 #
 
-obj-y := malta_int.o malta_setup.o
+obj-y := malta_int.o malta_mtd.o malta_setup.o
 obj-$(CONFIG_SMP) += malta_smp.o
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index 282f3e52eea3..56ea76679cd4 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -21,13 +21,6 @@
 #include <linux/pci.h>
 #include <linux/screen_info.h>
 
-#ifdef CONFIG_MTD
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#endif
-
 #include <asm/cpu.h>
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
@@ -58,30 +51,6 @@ struct resource standard_io_resources[] = {
         { .name = "dma2", .start = 0xc0, .end = 0xdf, .flags = IORESOURCE_BUSY },
 };
 
-#ifdef CONFIG_MTD
-static struct mtd_partition malta_mtd_partitions[] = {
-        {
-                .name =         "YAMON",
-                .offset =       0x0,
-                .size =         0x100000,
-                .mask_flags =   MTD_WRITEABLE
-        },
-        {
-                .name =         "User FS",
-                .offset =       0x100000,
-                .size =         0x2e0000
-        },
-        {
-                .name =         "Board Config",
-                .offset =       0x3e0000,
-                .size =         0x020000,
-                .mask_flags =   MTD_WRITEABLE
-        }
-};
-
-#define number_partitions       (sizeof(malta_mtd_partitions)/sizeof(struct mtd_partition))
-#endif
-
 const char *get_system_type(void)
 {
         return "MIPS Malta";
@@ -211,14 +180,6 @@ void __init plat_mem_setup(void)
 #endif
 #endif
 
-#ifdef CONFIG_MTD
-        /*
-         * Support for MTD on Malta. Use the generic physmap driver
-         */
-        physmap_configure(0x1e000000, 0x400000, 4, NULL);
-        physmap_set_partitions(malta_mtd_partitions, number_partitions);
-#endif
-
         mips_reboot_setup();
 
         board_time_init = mips_time_init;