fix magicbox, convert mtd mapping to platform_device, add support for combined flash layout

SVN-Revision: 7336

2 files changed, 47 insertions, 113 deletions

diff --git a/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c b/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c
index 470fbc4e08..e65319bc61 100644
--- a/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c
+++ b/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c
@@ -24,6 +24,9 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
 
 #include <asm/system.h>
 #include <asm/pci-bridge.h>
@@ -214,6 +217,50 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 #endif /* DEBUG */
 }
 
+static struct resource magicbox_flash_resource = {
+	.start = 0xffc00000,
+	.end   = 0xffffffffULL,
+	.flags = IORESOURCE_MEM,
+};
+
+static struct mtd_partition magicbox_flash_parts[] = {
+	{
+		.name = "linux",
+		.offset = 0x0,
+		.size = 0x3c0000,
+	},
+	{
+		.name = "rootfs",
+		.offset = 0x100000,
+		.size = 0x2c0000,
+	}
+};
+
+static struct physmap_flash_data magicbox_flash_data = {
+	.width		= 2,
+	.parts		= magicbox_flash_parts,
+	.nr_parts	= ARRAY_SIZE(magicbox_flash_parts),
+};
+
+static struct platform_device magicbox_flash_device = {
+	.name		= "physmap-flash",
+	.id		= 0,
+	.dev = {
+			.platform_data = &magicbox_flash_data,
+		},
+	.num_resources	= 1,
+	.resource	= &magicbox_flash_resource,
+};
+
+static int magicbox_setup_flash(void)
+{
+	platform_device_register(&magicbox_flash_device);
+
+	return 0;
+};
+
+arch_initcall (magicbox_setup_flash);
+
 void __init
 magicbox_setup_arch(void)
 {
diff --git a/target/linux/magicbox-2.6/files/drivers/mtd/maps/magicmap.c b/target/linux/magicbox-2.6/files/drivers/mtd/maps/magicmap.c
deleted file mode 100644
index b654a3d9bd..0000000000
--- a/target/linux/magicbox-2.6/files/drivers/mtd/maps/magicmap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * magicmap.c: Copyleft 2005  Karol Lewandowski
- *
- * Mapping for MagicBox flash.
- * Based on walnut.c.
- *
- * Heikki Lindholm <holindho@infradead.org>
- *
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#include <linux/autoconf.h>
-#include <asm/io.h>
-
-static struct mtd_info *flash;
-
-static struct map_info magic_map = {
-	.name =		"Magically mapped flash",
-	.phys =         0xffc00000,
-	.size =		0x400000,
-	.bankwidth =	2,
-};
-
-static struct mtd_partition magic_partitions[] = {
-	{
-		.name =   "linux",
-		.offset = 0x0,
-		.size =   0x3c0000,
-	},
-	{
-		.name =   "rootfs",
-		.offset = 0x100000,
-		.size =   0x2c0000,
-	},
-	{
-		.name =   "bootloader",
-		.offset = 0x3c0000,
-		.size =   0x040000,
-		.mask_flags = MTD_WRITEABLE,
-	},
-};
-
-int __init init_magic(void)
-{
-	u32 size, len;
-	
-	magic_map.virt =
-		(void __iomem *)ioremap(magic_map.phys, magic_map.size);
-
-	if (!magic_map.virt) {
-		printk("Failed to ioremap flash.\n");
-		return -EIO;
-	}
-
-	simple_map_init(&magic_map);
-
-	flash = do_map_probe("cfi_probe", &magic_map);
-	if (flash) {
-		flash->owner = THIS_MODULE;
-		if (flash->read(flash, 12, sizeof(u32), &len, (char *) &size) ||
-			len != 4)
-			return -ENXIO;
-		size += 0x40; /* header size of the uImage */
-		if (size < 0x400000) {
-			/* skip to next erase block */
-			if (size & (flash->erasesize - 1)) {
-				size |= (flash->erasesize - 1);
-				size += 1;
-			}
-			magic_partitions[1].offset = size;
-			magic_partitions[1].size = magic_partitions[2].offset - size;
-		}
-		
-		add_mtd_partitions(flash, magic_partitions,
-					ARRAY_SIZE(magic_partitions));
-	} else {
-		printk("map probe failed for flash\n");
-		return -ENXIO;
-	}
-
-	return 0;
-}
-
-static void __exit cleanup_magic(void)
-{
-	if (flash) {
-		del_mtd_partitions(flash);
-		map_destroy(flash);
-	}
-
-	if (magic_map.virt) {
-		iounmap((void *)magic_map.virt);
-		magic_map.virt = NULL;
-	}
-}
-
-module_init(init_magic);
-module_exit(cleanup_magic);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Karol Lewandowski");
-MODULE_DESCRIPTION("MTD map and partitions for IBM 405EP MagicBox boards");