11 files changed, 323 insertions, 349 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 82923bd2d9c5..0b98654d8eed 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -105,15 +105,6 @@ config MSP_FLASH_MAP_LIMIT
         default "0x02000000"
         depends on MSP_FLASH_MAP_LIMIT_32M
 
-config MTD_PMC_MSP_RAMROOT
-        tristate "Embedded RAM block device for root on PMC-Sierra MSP"
-        depends on PMC_MSP_EMBEDDED_ROOTFS && \
-                        (MTD_BLOCK || MTD_BLOCK_RO) && \
-                        MTD_RAM
-        help
-          This provides support for the embedded root file system
-          on PMC MSP devices.  This memory is mapped as a MTD block device.
-
 config MTD_SUN_UFLASH
         tristate "Sun Microsystems userflash support"
         depends on SPARC && MTD_CFI && PCI
@@ -270,7 +261,7 @@ config MTD_ALCHEMY
 
 config MTD_DILNETPC
         tristate "CFI Flash device mapped on DIL/Net PC"
-        depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT
+        depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
         help
           MTD map driver for SSV DIL/Net PC Boards "DNP" and "ADNP".
           For details, see <http://www.ssv-embedded.de/ssv/pc104/p169.htm>
@@ -501,7 +492,7 @@ config MTD_BFIN_ASYNC
           If compiled as a module, it will be called bfin-async-flash.
 
 config MTD_UCLINUX
-        tristate "Generic uClinux RAM/ROM filesystem support"
+        bool "Generic uClinux RAM/ROM filesystem support"
         depends on MTD_PARTITIONS && MTD_RAM && !MMU
         help
           Map driver to support image based filesystems for uClinux.
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 2dbc1bec8488..8bae7f9850c0 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_MTD_OCTAGON)	+= octagon-5066.o
 obj-$(CONFIG_MTD_PHYSMAP)       += physmap.o
 obj-$(CONFIG_MTD_PHYSMAP_OF)    += physmap_of.o
 obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcmsp-flash.o
-obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcmsp-ramroot.o
 obj-$(CONFIG_MTD_PCMCIA)        += pcmciamtd.o
 obj-$(CONFIG_MTD_RPXLITE)       += rpxlite.o
 obj-$(CONFIG_MTD_TQM8XXL)       += tqm8xxl.o
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index 576611f605db..365c77b1b871 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -40,6 +40,9 @@ struct async_state {
         uint32_t flash_ambctl0, flash_ambctl1;
         uint32_t save_ambctl0, save_ambctl1;
         unsigned long irq_flags;
+#ifdef CONFIG_MTD_PARTITIONS
+        struct mtd_partition *parts;
+#endif
 };
 
 static void switch_to_flash(struct async_state *state)
@@ -170,6 +173,7 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev)
         if (ret > 0) {
                 pr_devinit(KERN_NOTICE DRIVER_NAME ": Using commandline partition definition\n");
                 add_mtd_partitions(state->mtd, pdata->parts, ret);
+                state->parts = pdata->parts;
 
         } else if (pdata->nr_parts) {
                 pr_devinit(KERN_NOTICE DRIVER_NAME ": Using board partition definition\n");
@@ -193,6 +197,7 @@ static int __devexit bfin_flash_remove(struct platform_device *pdev)
         gpio_free(state->enet_flash_pin);
 #ifdef CONFIG_MTD_PARTITIONS
         del_mtd_partitions(state->mtd);
+        kfree(state->parts);
 #endif
         map_destroy(state->mtd);
         kfree(state);
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index c9681a339a59..b08a798ee254 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -36,27 +36,33 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+#include <linux/mtd/concat.h>
 
 #include <asm/mach/flash.h>
 #include <mach/hardware.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_ARCH_P720T
-#define FLASH_BASE              (0x04000000)
-#define FLASH_SIZE              (64*1024*1024)
-#endif
+#define SUBDEV_NAME_SIZE        (BUS_ID_SIZE + 2)
 
-struct armflash_info {
+struct armflash_subdev_info {
+        char                    name[SUBDEV_NAME_SIZE];
+        struct mtd_info         *mtd;
+        struct map_info         map;
         struct flash_platform_data *plat;
+};
+
+struct armflash_info {
         struct resource         *res;
         struct mtd_partition    *parts;
         struct mtd_info         *mtd;
-        struct map_info         map;
+        int                     nr_subdev;
+        struct armflash_subdev_info subdev[0];
 };
 
 static void armflash_set_vpp(struct map_info *map, int on)
 {
-        struct armflash_info *info = container_of(map, struct armflash_info, map);
+        struct armflash_subdev_info *info =
+                container_of(map, struct armflash_subdev_info, map);
 
         if (info->plat && info->plat->set_vpp)
                 info->plat->set_vpp(on);
@@ -64,32 +70,17 @@ static void armflash_set_vpp(struct map_info *map, int on)
 
 static const char *probes[] = { "cmdlinepart", "RedBoot", "afs", NULL };
 
-static int armflash_probe(struct platform_device *dev)
+static int armflash_subdev_probe(struct armflash_subdev_info *subdev,
+                                 struct resource *res)
 {
-        struct flash_platform_data *plat = dev->dev.platform_data;
-        struct resource *res = dev->resource;
-        unsigned int size = res->end - res->start + 1;
-        struct armflash_info *info;
-        int err;
+        struct flash_platform_data *plat = subdev->plat;
+        resource_size_t size = res->end - res->start + 1;
         void __iomem *base;
+        int err = 0;
 
-        info = kzalloc(sizeof(struct armflash_info), GFP_KERNEL);
-        if (!info) {
-                err = -ENOMEM;
-                goto out;
-        }
-
-        info->plat = plat;
-        if (plat && plat->init) {
-                err = plat->init();
-                if (err)
-                        goto no_resource;
-        }
-
-        info->res = request_mem_region(res->start, size, "armflash");
-        if (!info->res) {
+        if (!request_mem_region(res->start, size, subdev->name)) {
                 err = -EBUSY;
-                goto no_resource;
+                goto out;
         }
 
         base = ioremap(res->start, size);
@@ -101,27 +92,132 @@ static int armflash_probe(struct platform_device *dev)
         /*
          * look for CFI based flash parts fitted to this board
          */
-        info->map.size          = size;
-        info->map.bankwidth     = plat->width;
-        info->map.phys          = res->start;
-        info->map.virt          = base;
-        info->map.name          = dev_name(&dev->dev);
-        info->map.set_vpp       = armflash_set_vpp;
+        subdev->map.size        = size;
+        subdev->map.bankwidth   = plat->width;
+        subdev->map.phys        = res->start;
+        subdev->map.virt        = base;
+        subdev->map.name        = subdev->name;
+        subdev->map.set_vpp     = armflash_set_vpp;
 
-        simple_map_init(&info->map);
+        simple_map_init(&subdev->map);
 
         /*
          * Also, the CFI layer automatically works out what size
          * of chips we have, and does the necessary identification
          * for us automatically.
          */
-        info->mtd = do_map_probe(plat->map_name, &info->map);
-        if (!info->mtd) {
+        subdev->mtd = do_map_probe(plat->map_name, &subdev->map);
+        if (!subdev->mtd) {
                 err = -ENXIO;
                 goto no_device;
         }
 
-        info->mtd->owner = THIS_MODULE;
+        subdev->mtd->owner = THIS_MODULE;
+
+        /* Successful? */
+        if (err == 0)
+                return err;
+
+        if (subdev->mtd)
+                map_destroy(subdev->mtd);
+ no_device:
+        iounmap(base);
+ no_mem:
+        release_mem_region(res->start, size);
+ out:
+        return err;
+}
+
+static void armflash_subdev_remove(struct armflash_subdev_info *subdev)
+{
+        if (subdev->mtd)
+                map_destroy(subdev->mtd);
+        if (subdev->map.virt)
+                iounmap(subdev->map.virt);
+        release_mem_region(subdev->map.phys, subdev->map.size);
+}
+
+static int armflash_probe(struct platform_device *dev)
+{
+        struct flash_platform_data *plat = dev->dev.platform_data;
+        unsigned int size;
+        struct armflash_info *info;
+        int i, nr, err;
+
+        /* Count the number of devices */
+        for (nr = 0; ; nr++)
+                if (!platform_get_resource(dev, IORESOURCE_MEM, nr))
+                        break;
+        if (nr == 0) {
+                err = -ENODEV;
+                goto out;
+        }
+
+        size = sizeof(struct armflash_info) +
+                sizeof(struct armflash_subdev_info) * nr;
+        info = kzalloc(size, GFP_KERNEL);
+        if (!info) {
+                err = -ENOMEM;
+                goto out;
+        }
+
+        if (plat && plat->init) {
+                err = plat->init();
+                if (err)
+                        goto no_resource;
+        }
+
+        for (i = 0; i < nr; i++) {
+                struct armflash_subdev_info *subdev = &info->subdev[i];
+                struct resource *res;
+
+                res = platform_get_resource(dev, IORESOURCE_MEM, i);
+                if (!res)
+                        break;
+
+                if (nr == 1)
+                        /* No MTD concatenation, just use the default name */
+                        snprintf(subdev->name, SUBDEV_NAME_SIZE, "%s",
+                                 dev_name(&dev->dev));
+                else
+                        snprintf(subdev->name, SUBDEV_NAME_SIZE, "%s-%d",
+                                 dev_name(&dev->dev), i);
+                subdev->plat = plat;
+
+                err = armflash_subdev_probe(subdev, res);
+                if (err)
+                        break;
+        }
+        info->nr_subdev = i;
+
+        if (err)
+                goto subdev_err;
+
+        if (info->nr_subdev == 1)
+                info->mtd = info->subdev[0].mtd;
+        else if (info->nr_subdev > 1) {
+#ifdef CONFIG_MTD_CONCAT
+                struct mtd_info *cdev[info->nr_subdev];
+
+                /*
+                 * We detected multiple devices.  Concatenate them together.
+                 */
+                for (i = 0; i < info->nr_subdev; i++)
+                        cdev[i] = info->subdev[i].mtd;
+
+                info->mtd = mtd_concat_create(cdev, info->nr_subdev,
+                                              dev_name(&dev->dev));
+                if (info->mtd == NULL)
+                        err = -ENXIO;
+#else
+                printk(KERN_ERR "armflash: multiple devices found but "
+                       "MTD concat support disabled.\n");
+                err = -ENXIO;
+#endif
+        }
+
+        if (err < 0)
+                goto cleanup;
 
         err = parse_mtd_partitions(info->mtd, probes, &info->parts, 0);
         if (err > 0) {
@@ -131,28 +227,30 @@ static int armflash_probe(struct platform_device *dev)
                                "mtd partition registration failed: %d\n", err);
         }
 
-        if (err == 0)
+        if (err == 0) {
                 platform_set_drvdata(dev, info);
+                return err;
+        }
 
         /*
-         * If we got an error, free all resources.
+         * We got an error, free all resources.
          */
-        if (err < 0) {
-                if (info->mtd) {
-                        del_mtd_partitions(info->mtd);
-                        map_destroy(info->mtd);
-                }
-                kfree(info->parts);
-
- no_device:
-                iounmap(base);
- no_mem:
-                release_mem_region(res->start, size);
- no_resource:
-                if (plat && plat->exit)
-                        plat->exit();
-                kfree(info);
+ cleanup:
+        if (info->mtd) {
+                del_mtd_partitions(info->mtd);
+#ifdef CONFIG_MTD_CONCAT
+                if (info->mtd != info->subdev[0].mtd)
+                        mtd_concat_destroy(info->mtd);
+#endif
         }
+        kfree(info->parts);
+ subdev_err:
+        for (i = info->nr_subdev - 1; i >= 0; i--)
+                armflash_subdev_remove(&info->subdev[i]);
+ no_resource:
+        if (plat && plat->exit)
+                plat->exit();
+        kfree(info);
  out:
         return err;
 }
@@ -160,22 +258,26 @@ static int armflash_probe(struct platform_device *dev)
 static int armflash_remove(struct platform_device *dev)
 {
         struct armflash_info *info = platform_get_drvdata(dev);
+        struct flash_platform_data *plat = dev->dev.platform_data;
+        int i;
 
         platform_set_drvdata(dev, NULL);
 
         if (info) {
                 if (info->mtd) {
                         del_mtd_partitions(info->mtd);
-                        map_destroy(info->mtd);
+#ifdef CONFIG_MTD_CONCAT
+                        if (info->mtd != info->subdev[0].mtd)
+                                mtd_concat_destroy(info->mtd);
+#endif
                 }
                 kfree(info->parts);
 
-                iounmap(info->map.virt);
-                release_resource(info->res);
-                kfree(info->res);
+                for (i = info->nr_subdev - 1; i >= 0; i--)
+                        armflash_subdev_remove(&info->subdev[i]);
 
-                if (info->plat && info->plat->exit)
-                        info->plat->exit();
+                if (plat && plat->exit)
+                        plat->exit();
 
                 kfree(info);
         }
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 29a901157352..380648e9051a 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -195,42 +195,6 @@ err_out:
 }
 
 #ifdef CONFIG_PM
-static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state)
-{
-        struct physmap_flash_info *info = platform_get_drvdata(dev);
-        int ret = 0;
-        int i;
-
-        for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
-                if (info->mtd[i]->suspend) {
-                        ret = info->mtd[i]->suspend(info->mtd[i]);
-                        if (ret)
-                                goto fail;
-                }
-
-        return 0;
-fail:
-        for (--i; i >= 0; --i)
-                if (info->mtd[i]->suspend) {
-                        BUG_ON(!info->mtd[i]->resume);
-                        info->mtd[i]->resume(info->mtd[i]);
-                }
-
-        return ret;
-}
-
-static int physmap_flash_resume(struct platform_device *dev)
-{
-        struct physmap_flash_info *info = platform_get_drvdata(dev);
-        int i;
-
-        for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
-                if (info->mtd[i]->resume)
-                        info->mtd[i]->resume(info->mtd[i]);
-
-        return 0;
-}
-
 static void physmap_flash_shutdown(struct platform_device *dev)
 {
         struct physmap_flash_info *info = platform_get_drvdata(dev);
@@ -242,16 +206,12 @@ static void physmap_flash_shutdown(struct platform_device *dev)
                                 info->mtd[i]->resume(info->mtd[i]);
 }
 #else
-#define physmap_flash_suspend NULL
-#define physmap_flash_resume NULL
 #define physmap_flash_shutdown NULL
 #endif
 
 static struct platform_driver physmap_flash_driver = {
         .probe          = physmap_flash_probe,
         .remove         = physmap_flash_remove,
-        .suspend        = physmap_flash_suspend,
-        .resume         = physmap_flash_resume,
         .shutdown       = physmap_flash_shutdown,
         .driver         = {
                 .name   = "physmap-flash",
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index c83a60fada53..39d357b2eb47 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -20,16 +20,23 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+#include <linux/mtd/concat.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 
+struct of_flash_list {
+        struct mtd_info *mtd;
+        struct map_info map;
+        struct resource *res;
+};
+
 struct of_flash {
-        struct mtd_info         *mtd;
-        struct map_info         map;
-        struct resource         *res;
+        struct mtd_info         *cmtd;
 #ifdef CONFIG_MTD_PARTITIONS
         struct mtd_partition    *parts;
 #endif
+        int list_size; /* number of elements in of_flash_list */
+        struct of_flash_list    list[0];
 };
 
 #ifdef CONFIG_MTD_PARTITIONS
@@ -88,30 +95,44 @@ static int parse_obsolete_partitions(struct of_device *dev,
 static int of_flash_remove(struct of_device *dev)
 {
         struct of_flash *info;
+        int i;
 
         info = dev_get_drvdata(&dev->dev);
         if (!info)
                 return 0;
         dev_set_drvdata(&dev->dev, NULL);
 
-        if (info->mtd) {
+#ifdef CONFIG_MTD_CONCAT
+        if (info->cmtd != info->list[0].mtd) {
+                del_mtd_device(info->cmtd);
+                mtd_concat_destroy(info->cmtd);
+        }
+#endif
+
+        if (info->cmtd) {
                 if (OF_FLASH_PARTS(info)) {
-                        del_mtd_partitions(info->mtd);
+                        del_mtd_partitions(info->cmtd);
                         kfree(OF_FLASH_PARTS(info));
                 } else {
-                        del_mtd_device(info->mtd);
+                        del_mtd_device(info->cmtd);
                 }
-                map_destroy(info->mtd);
         }
 
-        if (info->map.virt)
-                iounmap(info->map.virt);
+        for (i = 0; i < info->list_size; i++) {
+                if (info->list[i].mtd)
+                        map_destroy(info->list[i].mtd);
 
-        if (info->res) {
-                release_resource(info->res);
-                kfree(info->res);
+                if (info->list[i].map.virt)
+                        iounmap(info->list[i].map.virt);
+
+                if (info->list[i].res) {
+                        release_resource(info->list[i].res);
+                        kfree(info->list[i].res);
+                }
         }
 
+        kfree(info);
+
         return 0;
 }
 
@@ -164,68 +185,130 @@ static int __devinit of_flash_probe(struct of_device *dev,
         const char *probe_type = match->data;
         const u32 *width;
         int err;
-
-        err = -ENXIO;
-        if (of_address_to_resource(dp, 0, &res)) {
-                dev_err(&dev->dev, "Can't get IO address from device tree\n");
+        int i;
+        int count;
+        const u32 *p;
+        int reg_tuple_size;
+        struct mtd_info **mtd_list = NULL;
+
+        reg_tuple_size = (of_n_addr_cells(dp) + of_n_size_cells(dp)) * sizeof(u32);
+
+        /*
+         * Get number of "reg" tuples. Scan for MTD devices on area's
+         * described by each "reg" region. This makes it possible (including
+         * the concat support) to support the Intel P30 48F4400 chips which
+         * consists internally of 2 non-identical NOR chips on one die.
+         */
+        p = of_get_property(dp, "reg", &count);
+        if (count % reg_tuple_size != 0) {
+                dev_err(&dev->dev, "Malformed reg property on %s\n",
+                                dev->node->full_name);
+                err = -EINVAL;
                 goto err_out;
         }
-
-        dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",
-                (unsigned long long)res.start, (unsigned long long)res.end);
+        count /= reg_tuple_size;
 
         err = -ENOMEM;
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct of_flash) +
+                       sizeof(struct of_flash_list) * count, GFP_KERNEL);
+        if (!info)
+                goto err_out;
+
+        mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
         if (!info)
                 goto err_out;
 
         dev_set_drvdata(&dev->dev, info);
 
-        err = -EBUSY;
-        info->res = request_mem_region(res.start, res.end - res.start + 1,
-                                       dev_name(&dev->dev));
-        if (!info->res)
-                goto err_out;
+        for (i = 0; i < count; i++) {
+                err = -ENXIO;
+                if (of_address_to_resource(dp, i, &res)) {
+                        dev_err(&dev->dev, "Can't get IO address from device"
+                                " tree\n");
+                        goto err_out;
+                }
 
-        err = -ENXIO;
-        width = of_get_property(dp, "bank-width", NULL);
-        if (!width) {
-                dev_err(&dev->dev, "Can't get bank width from device tree\n");
-                goto err_out;
-        }
+                dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",
+                        (unsigned long long)res.start,
+                        (unsigned long long)res.end);
+
+                err = -EBUSY;
+                info->list[i].res = request_mem_region(res.start, res.end -
+                                                       res.start + 1,
+                                                       dev_name(&dev->dev));
+                if (!info->list[i].res)
+                        goto err_out;
+
+                err = -ENXIO;
+                width = of_get_property(dp, "bank-width", NULL);
+                if (!width) {
+                        dev_err(&dev->dev, "Can't get bank width from device"
+                                " tree\n");
+                        goto err_out;
+                }
 
-        info->map.name = dev_name(&dev->dev);
-        info->map.phys = res.start;
-        info->map.size = res.end - res.start + 1;
-        info->map.bankwidth = *width;
+                info->list[i].map.name = dev_name(&dev->dev);
+                info->list[i].map.phys = res.start;
+                info->list[i].map.size = res.end - res.start + 1;
+                info->list[i].map.bankwidth = *width;
+
+                err = -ENOMEM;
+                info->list[i].map.virt = ioremap(info->list[i].map.phys,
+                                                 info->list[i].map.size);
+                if (!info->list[i].map.virt) {
+                        dev_err(&dev->dev, "Failed to ioremap() flash"
+                                " region\n");
+                        goto err_out;
+                }
 
-        err = -ENOMEM;
-        info->map.virt = ioremap(info->map.phys, info->map.size);
-        if (!info->map.virt) {
-                dev_err(&dev->dev, "Failed to ioremap() flash region\n");
-                goto err_out;
-        }
+                simple_map_init(&info->list[i].map);
 
-        simple_map_init(&info->map);
+                if (probe_type) {
+                        info->list[i].mtd = do_map_probe(probe_type,
+                                                         &info->list[i].map);
+                } else {
+                        info->list[i].mtd = obsolete_probe(dev,
+                                                           &info->list[i].map);
+                }
+                mtd_list[i] = info->list[i].mtd;
 
-        if (probe_type)
-                info->mtd = do_map_probe(probe_type, &info->map);
-        else
-                info->mtd = obsolete_probe(dev, &info->map);
+                err = -ENXIO;
+                if (!info->list[i].mtd) {
+                        dev_err(&dev->dev, "do_map_probe() failed\n");
+                        goto err_out;
+                } else {
+                        info->list_size++;
+                }
+                info->list[i].mtd->owner = THIS_MODULE;
+                info->list[i].mtd->dev.parent = &dev->dev;
+        }
 
-        err = -ENXIO;
-        if (!info->mtd) {
-                dev_err(&dev->dev, "do_map_probe() failed\n");
-                goto err_out;
+        err = 0;
+        if (info->list_size == 1) {
+                info->cmtd = info->list[0].mtd;
+        } else if (info->list_size > 1) {
+                /*
+                 * We detected multiple devices. Concatenate them together.
+                 */
+#ifdef CONFIG_MTD_CONCAT
+                info->cmtd = mtd_concat_create(mtd_list, info->list_size,
+                                               dev_name(&dev->dev));
+                if (info->cmtd == NULL)
+                        err = -ENXIO;
+#else
+                printk(KERN_ERR "physmap_of: multiple devices "
+                       "found but MTD concat support disabled.\n");
+                err = -ENXIO;
+#endif
         }
-        info->mtd->owner = THIS_MODULE;
-        info->mtd->dev.parent = &dev->dev;
+        if (err)
+                goto err_out;
 
 #ifdef CONFIG_MTD_PARTITIONS
         /* First look for RedBoot table or partitions on the command
          * line, these take precedence over device tree information */
-        err = parse_mtd_partitions(info->mtd, part_probe_types,
-                                   &info->parts, 0);
+        err = parse_mtd_partitions(info->cmtd, part_probe_types,
+                                   &info->parts, 0);
         if (err < 0)
                 return err;
 
@@ -244,15 +327,19 @@ static int __devinit of_flash_probe(struct of_device *dev,
         }
 
         if (err > 0)
-                add_mtd_partitions(info->mtd, info->parts, err);
+                add_mtd_partitions(info->cmtd, info->parts, err);
         else
 #endif
-                add_mtd_device(info->mtd);
+                add_mtd_device(info->cmtd);
+
+        kfree(mtd_list);
 
         return 0;
 
 err_out:
+        kfree(mtd_list);
         of_flash_remove(dev);
+
         return err;
 }
 
diff --git a/drivers/mtd/maps/pmcmsp-ramroot.c b/drivers/mtd/maps/pmcmsp-ramroot.c
deleted file mode 100644
index 30de5c0c09a9..000000000000
--- a/drivers/mtd/maps/pmcmsp-ramroot.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Mapping of the rootfs in a physical region of memory
- *
- * Copyright (C) 2005-2007 PMC-Sierra Inc.
- * Author: Andrew Hughes, Andrew_Hughes@pmc-sierra.com
- *
- *  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.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/fs.h>
-#include <linux/root_dev.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-
-#include <asm/io.h>
-
-#include <msp_prom.h>
-
-static struct mtd_info *rr_mtd;
-
-struct map_info rr_map = {
-        .name = "ramroot",
-        .bankwidth = 4,
-};
-
-static int __init init_rrmap(void)
-{
-        void *ramroot_start;
-        unsigned long ramroot_size;
-
-        /* Check for supported rootfs types */
-        if (get_ramroot(&ramroot_start, &ramroot_size)) {
-                rr_map.phys = CPHYSADDR(ramroot_start);
-                rr_map.size = ramroot_size;
-
-                printk(KERN_NOTICE
-                        "PMC embedded root device: 0x%08lx @ 0x%08lx\n",
-                        rr_map.size, (unsigned long)rr_map.phys);
-        } else {
-                printk(KERN_ERR
-                        "init_rrmap: no supported embedded rootfs detected!\n");
-                return -ENXIO;
-        }
-
-        /* Map rootfs to I/O space for block device driver */
-        rr_map.virt = ioremap(rr_map.phys, rr_map.size);
-        if (!rr_map.virt) {
-                printk(KERN_ERR "Failed to ioremap\n");
-                return -EIO;
-        }
-
-        simple_map_init(&rr_map);
-
-        rr_mtd = do_map_probe("map_ram", &rr_map);
-        if (rr_mtd) {
-                rr_mtd->owner = THIS_MODULE;
-
-                add_mtd_device(rr_mtd);
-
-                return 0;
-        }
-
-        iounmap(rr_map.virt);
-        return -ENXIO;
-}
-
-static void __exit cleanup_rrmap(void)
-{
-        del_mtd_device(rr_mtd);
-        map_destroy(rr_mtd);
-
-        iounmap(rr_map.virt);
-        rr_map.virt = NULL;
-}
-
-MODULE_AUTHOR("PMC-Sierra, Inc");
-MODULE_DESCRIPTION("MTD map driver for embedded PMC-Sierra MSP filesystem");
-MODULE_LICENSE("GPL");
-
-module_init(init_rrmap);
-module_exit(cleanup_rrmap);
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 572d32fdf38a..643aa06b599e 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -140,24 +140,6 @@ static int __devexit pxa2xx_flash_remove(struct platform_device *dev)
 }
 
 #ifdef CONFIG_PM
-static int pxa2xx_flash_suspend(struct platform_device *dev, pm_message_t state)
-{
-        struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
-        int ret = 0;
-
-        if (info->mtd && info->mtd->suspend)
-                ret = info->mtd->suspend(info->mtd);
-        return ret;
-}
-
-static int pxa2xx_flash_resume(struct platform_device *dev)
-{
-        struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
-
-        if (info->mtd && info->mtd->resume)
-                info->mtd->resume(info->mtd);
-        return 0;
-}
 static void pxa2xx_flash_shutdown(struct platform_device *dev)
 {
         struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
@@ -166,8 +148,6 @@ static void pxa2xx_flash_shutdown(struct platform_device *dev)
                 info->mtd->resume(info->mtd);
 }
 #else
-#define pxa2xx_flash_suspend NULL
-#define pxa2xx_flash_resume NULL
 #define pxa2xx_flash_shutdown NULL
 #endif
 
@@ -178,8 +158,6 @@ static struct platform_driver pxa2xx_flash_driver = {
         },
         .probe          = pxa2xx_flash_probe,
         .remove         = __devexit_p(pxa2xx_flash_remove),
-        .suspend        = pxa2xx_flash_suspend,
-        .resume         = pxa2xx_flash_resume,
         .shutdown       = pxa2xx_flash_shutdown,
 };
 
diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c
index d39f0adac846..83ed64512c5e 100644
--- a/drivers/mtd/maps/rbtx4939-flash.c
+++ b/drivers/mtd/maps/rbtx4939-flash.c
@@ -145,25 +145,6 @@ err_out:
 }
 
 #ifdef CONFIG_PM
-static int rbtx4939_flash_suspend(struct platform_device *dev,
-                                  pm_message_t state)
-{
-        struct rbtx4939_flash_info *info = platform_get_drvdata(dev);
-
-        if (info->mtd->suspend)
-                return info->mtd->suspend(info->mtd);
-        return 0;
-}
-
-static int rbtx4939_flash_resume(struct platform_device *dev)
-{
-        struct rbtx4939_flash_info *info = platform_get_drvdata(dev);
-
-        if (info->mtd->resume)
-                info->mtd->resume(info->mtd);
-        return 0;
-}
-
 static void rbtx4939_flash_shutdown(struct platform_device *dev)
 {
         struct rbtx4939_flash_info *info = platform_get_drvdata(dev);
@@ -173,16 +154,12 @@ static void rbtx4939_flash_shutdown(struct platform_device *dev)
                         info->mtd->resume(info->mtd);
 }
 #else
-#define rbtx4939_flash_suspend NULL
-#define rbtx4939_flash_resume NULL
 #define rbtx4939_flash_shutdown NULL
 #endif
 
 static struct platform_driver rbtx4939_flash_driver = {
         .probe          = rbtx4939_flash_probe,
         .remove         = rbtx4939_flash_remove,
-        .suspend        = rbtx4939_flash_suspend,
-        .resume         = rbtx4939_flash_resume,
         .shutdown       = rbtx4939_flash_shutdown,
         .driver         = {
                 .name   = "rbtx4939-flash",
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 05e9362dc7f0..c6210f5118d1 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -415,25 +415,6 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int sa1100_mtd_suspend(struct platform_device *dev, pm_message_t state)
-{
-        struct sa_info *info = platform_get_drvdata(dev);
-        int ret = 0;
-
-        if (info)
-                ret = info->mtd->suspend(info->mtd);
-
-        return ret;
-}
-
-static int sa1100_mtd_resume(struct platform_device *dev)
-{
-        struct sa_info *info = platform_get_drvdata(dev);
-        if (info)
-                info->mtd->resume(info->mtd);
-        return 0;
-}
-
 static void sa1100_mtd_shutdown(struct platform_device *dev)
 {
         struct sa_info *info = platform_get_drvdata(dev);
@@ -441,16 +422,12 @@ static void sa1100_mtd_shutdown(struct platform_device *dev)
                 info->mtd->resume(info->mtd);
 }
 #else
-#define sa1100_mtd_suspend NULL
-#define sa1100_mtd_resume  NULL
 #define sa1100_mtd_shutdown NULL
 #endif
 
 static struct platform_driver sa1100_mtd_driver = {
         .probe          = sa1100_mtd_probe,
         .remove         = __exit_p(sa1100_mtd_remove),
-        .suspend        = sa1100_mtd_suspend,
-        .resume         = sa1100_mtd_resume,
         .shutdown       = sa1100_mtd_shutdown,
         .driver         = {
                 .name   = "sa1100-mtd",
diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index 81756e397711..d4314fb88212 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -22,15 +22,19 @@
 
 /****************************************************************************/
 
+extern char _ebss;
+
 struct map_info uclinux_ram_map = {
         .name = "RAM",
+        .phys = (unsigned long)&_ebss,
+        .size = 0,
 };
 
-struct mtd_info *uclinux_ram_mtdinfo;
+static struct mtd_info *uclinux_ram_mtdinfo;
 
 /****************************************************************************/
 
-struct mtd_partition uclinux_romfs[] = {
+static struct mtd_partition uclinux_romfs[] = {
         { .name = "ROMfs" }
 };
 
@@ -38,7 +42,7 @@ struct mtd_partition uclinux_romfs[] = {
 
 /****************************************************************************/
 
-int uclinux_point(struct mtd_info *mtd, loff_t from, size_t len,
+static int uclinux_point(struct mtd_info *mtd, loff_t from, size_t len,
         size_t *retlen, void **virt, resource_size_t *phys)
 {
         struct map_info *map = mtd->priv;
@@ -55,12 +59,10 @@ static int __init uclinux_mtd_init(void)
 {
         struct mtd_info *mtd;
         struct map_info *mapp;
-        extern char _ebss;
-        unsigned long addr = (unsigned long) &_ebss;
 
         mapp = &uclinux_ram_map;
-        mapp->phys = addr;
-        mapp->size = PAGE_ALIGN(ntohl(*((unsigned long *)(addr + 8))));
+        if (!mapp->size)
+                mapp->size = PAGE_ALIGN(ntohl(*((unsigned long *)(mapp->phys + 8))));
         mapp->bankwidth = 4;
 
         printk("uclinux[mtd]: RAM probe address=0x%x size=0x%x\n",