8 files changed, 104 insertions, 294 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 5ba2458e799a..2e47c2ed0a2d 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -373,7 +373,7 @@ config MTD_FORTUNET
           have such a board, say 'Y'.
 
 config MTD_AUTCPU12
-        tristate "NV-RAM mapping AUTCPU12 board"
+        bool "NV-RAM mapping AUTCPU12 board"
         depends on ARCH_AUTCPU12
         help
           This enables access to the NV-RAM on autronix autcpu12 board.
@@ -443,22 +443,10 @@ config MTD_GPIO_ADDR
 
 config MTD_UCLINUX
         bool "Generic uClinux RAM/ROM filesystem support"
-        depends on MTD_RAM=y && !MMU
+        depends on MTD_RAM=y && (!MMU || COLDFIRE)
         help
           Map driver to support image based filesystems for uClinux.
 
-config MTD_WRSBC8260
-        tristate "Map driver for WindRiver PowerQUICC II MPC82xx board"
-        depends on (SBC82xx || SBC8560)
-        select MTD_MAP_BANK_WIDTH_4
-        select MTD_MAP_BANK_WIDTH_1
-        select MTD_CFI_I1
-        select MTD_CFI_I4
-        help
-          Map driver for WindRiver PowerQUICC II MPC82xx board. Drives
-          all three flash regions on CS0, CS1 and CS6 if they are configured
-          correctly by the boot loader.
-
 config MTD_DMV182
         tristate "Map driver for Dy-4 SVME/DMV-182 board."
         depends on DMV182
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 68a9a91d344f..deb43e9a1e7f 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -47,7 +47,6 @@ obj-$(CONFIG_MTD_SCB2_FLASH)	+= scb2_flash.o
 obj-$(CONFIG_MTD_H720X)         += h720x-flash.o
 obj-$(CONFIG_MTD_IXP4XX)        += ixp4xx.o
 obj-$(CONFIG_MTD_IXP2000)       += ixp2000.o
-obj-$(CONFIG_MTD_WRSBC8260)     += wr_sbc82xx_flash.o
 obj-$(CONFIG_MTD_DMV182)        += dmv182.o
 obj-$(CONFIG_MTD_PLATRAM)       += plat-ram.o
 obj-$(CONFIG_MTD_INTEL_VR_NOR)  += intel_vr_nor.o
diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index e5bfd0e093bb..76fb594bb1d9 100644
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -15,43 +15,54 @@
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
+#include <linux/sizes.h>
 
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/ioport.h>
 #include <linux/init.h>
-#include <asm/io.h>
-#include <asm/sizes.h>
-#include <mach/hardware.h>
-#include <mach/autcpu12.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-
-static struct mtd_info *sram_mtd;
 
-struct map_info autcpu12_sram_map = {
-        .name = "SRAM",
-        .size = 32768,
-        .bankwidth = 4,
-        .phys = 0x12000000,
+struct autcpu12_nvram_priv {
+        struct mtd_info *mtd;
+        struct map_info map;
 };
 
-static int __init init_autcpu12_sram (void)
+static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
 {
-        int err, save0, save1;
+        map_word tmp, save0, save1;
+        struct resource *res;
+        struct autcpu12_nvram_priv *priv;
 
-        autcpu12_sram_map.virt = ioremap(0x12000000, SZ_128K);
-        if (!autcpu12_sram_map.virt) {
-                printk("Failed to ioremap autcpu12 NV-RAM space\n");
-                err = -EIO;
-                goto out;
+        priv = devm_kzalloc(&pdev->dev,
+                            sizeof(struct autcpu12_nvram_priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, priv);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "failed to get memory resource\n");
+                return -ENOENT;
+        }
+
+        priv->map.bankwidth     = 4;
+        priv->map.phys          = res->start;
+        priv->map.size          = resource_size(res);
+        priv->map.virt          = devm_request_and_ioremap(&pdev->dev, res);
+        strcpy((char *)priv->map.name, res->name);
+        if (!priv->map.virt) {
+                dev_err(&pdev->dev, "failed to remap mem resource\n");
+                return -EBUSY;
         }
-        simple_map_init(&autcpu_sram_map);
+
+        simple_map_init(&priv->map);
 
         /*
          * Check for 32K/128K
@@ -61,65 +72,59 @@ static int __init init_autcpu12_sram (void)
          * Read and check result on ofs 0x0
          * Restore contents
          */
-        save0 = map_read32(&autcpu12_sram_map,0);
-        save1 = map_read32(&autcpu12_sram_map,0x10000);
-        map_write32(&autcpu12_sram_map,~save0,0x10000);
-        /* if we find this pattern on 0x0, we have 32K size
-         * restore contents and exit
-         */
-        if ( map_read32(&autcpu12_sram_map,0) != save0) {
-                map_write32(&autcpu12_sram_map,save0,0x0);
-                goto map;
+        save0 = map_read(&priv->map, 0);
+        save1 = map_read(&priv->map, 0x10000);
+        tmp.x[0] = ~save0.x[0];
+        map_write(&priv->map, tmp, 0x10000);
+        tmp = map_read(&priv->map, 0);
+        /* if we find this pattern on 0x0, we have 32K size */
+        if (!map_word_equal(&priv->map, tmp, save0)) {
+                map_write(&priv->map, save0, 0x0);
+                priv->map.size = SZ_32K;
+        } else
+                map_write(&priv->map, save1, 0x10000);
+
+        priv->mtd = do_map_probe("map_ram", &priv->map);
+        if (!priv->mtd) {
+                dev_err(&pdev->dev, "probing failed\n");
+                return -ENXIO;
         }
-        /* We have a 128K found, restore 0x10000 and set size
-         * to 128K
-         */
-        map_write32(&autcpu12_sram_map,save1,0x10000);
-        autcpu12_sram_map.size = SZ_128K;
-
-map:
-        sram_mtd = do_map_probe("map_ram", &autcpu12_sram_map);
-        if (!sram_mtd) {
-                printk("NV-RAM probe failed\n");
-                err = -ENXIO;
-                goto out_ioremap;
-        }
-
-        sram_mtd->owner = THIS_MODULE;
-        sram_mtd->erasesize = 16;
 
-        if (mtd_device_register(sram_mtd, NULL, 0)) {
-                printk("NV-RAM device addition failed\n");
-                err = -ENOMEM;
-                goto out_probe;
+        priv->mtd->owner        = THIS_MODULE;
+        priv->mtd->erasesize    = 16;
+        priv->mtd->dev.parent   = &pdev->dev;
+        if (!mtd_device_register(priv->mtd, NULL, 0)) {
+                dev_info(&pdev->dev,
+                         "NV-RAM device size %ldKiB registered on AUTCPU12\n",
+                         priv->map.size / SZ_1K);
+                return 0;
         }
 
-        printk("NV-RAM device size %ldKiB registered on AUTCPU12\n",autcpu12_sram_map.size/SZ_1K);
-
-        return 0;
-
-out_probe:
-        map_destroy(sram_mtd);
-        sram_mtd = 0;
-
-out_ioremap:
-        iounmap((void *)autcpu12_sram_map.virt);
-out:
-        return err;
+        map_destroy(priv->mtd);
+        dev_err(&pdev->dev, "NV-RAM device addition failed\n");
+        return -ENOMEM;
 }
 
-static void __exit cleanup_autcpu12_maps(void)
+static int __devexit autcpu12_nvram_remove(struct platform_device *pdev)
 {
-        if (sram_mtd) {
-                mtd_device_unregister(sram_mtd);
-                map_destroy(sram_mtd);
-                iounmap((void *)autcpu12_sram_map.virt);
-        }
+        struct autcpu12_nvram_priv *priv = platform_get_drvdata(pdev);
+
+        mtd_device_unregister(priv->mtd);
+        map_destroy(priv->mtd);
+
+        return 0;
 }
 
-module_init(init_autcpu12_sram);
-module_exit(cleanup_autcpu12_maps);
+static struct platform_driver autcpu12_nvram_driver = {
+        .driver         = {
+                .name   = "autcpu12_nvram",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = autcpu12_nvram_probe,
+        .remove         = __devexit_p(autcpu12_nvram_remove),
+};
+module_platform_driver(autcpu12_nvram_driver);
 
 MODULE_AUTHOR("Thomas Gleixner");
-MODULE_DESCRIPTION("autcpu12 NV-RAM map driver");
+MODULE_DESCRIPTION("autcpu12 NVRAM map driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index f14ce0af763f..1c30c1a307f4 100644
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -43,26 +43,14 @@ static map_word mtd_pci_read8(struct map_info *_map, unsigned long ofs)
         struct map_pci_info *map = (struct map_pci_info *)_map;
         map_word val;
         val.x[0]= readb(map->base + map->translate(map, ofs));
-//      printk("read8 : %08lx => %02x\n", ofs, val.x[0]);
         return val;
 }
 
-#if 0
-static map_word mtd_pci_read16(struct map_info *_map, unsigned long ofs)
-{
-        struct map_pci_info *map = (struct map_pci_info *)_map;
-        map_word val;
-        val.x[0] = readw(map->base + map->translate(map, ofs));
-//      printk("read16: %08lx => %04x\n", ofs, val.x[0]);
-        return val;
-}
-#endif
 static map_word mtd_pci_read32(struct map_info *_map, unsigned long ofs)
 {
         struct map_pci_info *map = (struct map_pci_info *)_map;
         map_word val;
         val.x[0] = readl(map->base + map->translate(map, ofs));
-//      printk("read32: %08lx => %08x\n", ofs, val.x[0]);
         return val;
 }
 
@@ -75,22 +63,12 @@ static void mtd_pci_copyfrom(struct map_info *_map, void *to, unsigned long from
 static void mtd_pci_write8(struct map_info *_map, map_word val, unsigned long ofs)
 {
         struct map_pci_info *map = (struct map_pci_info *)_map;
-//      printk("write8 : %08lx <= %02x\n", ofs, val.x[0]);
         writeb(val.x[0], map->base + map->translate(map, ofs));
 }
 
-#if 0
-static void mtd_pci_write16(struct map_info *_map, map_word val, unsigned long ofs)
-{
-        struct map_pci_info *map = (struct map_pci_info *)_map;
-//      printk("write16: %08lx <= %04x\n", ofs, val.x[0]);
-        writew(val.x[0], map->base + map->translate(map, ofs));
-}
-#endif
 static void mtd_pci_write32(struct map_info *_map, map_word val, unsigned long ofs)
 {
         struct map_pci_info *map = (struct map_pci_info *)_map;
-//      printk("write32: %08lx <= %08x\n", ofs, val.x[0]);
         writel(val.x[0], map->base + map->translate(map, ofs));
 }
 
@@ -358,4 +336,3 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
 MODULE_DESCRIPTION("Generic PCI map driver");
 MODULE_DEVICE_TABLE(pci, mtd_pci_ids);
-
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 2e6fb6831d55..6f19acadb06c 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -169,6 +169,7 @@ static int __devinit of_flash_probe(struct platform_device *dev)
         struct mtd_info **mtd_list = NULL;
         resource_size_t res_size;
         struct mtd_part_parser_data ppdata;
+        bool map_indirect;
 
         match = of_match_device(of_flash_match, &dev->dev);
         if (!match)
@@ -192,6 +193,8 @@ static int __devinit of_flash_probe(struct platform_device *dev)
         }
         count /= reg_tuple_size;
 
+        map_indirect = of_property_read_bool(dp, "no-unaligned-direct-access");
+
         err = -ENOMEM;
         info = kzalloc(sizeof(struct of_flash) +
                        sizeof(struct of_flash_list) * count, GFP_KERNEL);
@@ -247,6 +250,17 @@ static int __devinit of_flash_probe(struct platform_device *dev)
 
                 simple_map_init(&info->list[i].map);
 
+                /*
+                 * On some platforms (e.g. MPC5200) a direct 1:1 mapping
+                 * may cause problems with JFFS2 usage, as the local bus (LPB)
+                 * doesn't support unaligned accesses as implemented in the
+                 * JFFS2 code via memcpy(). By setting NO_XIP, the
+                 * flash will not be exposed directly to the MTD users
+                 * (e.g. JFFS2) any more.
+                 */
+                if (map_indirect)
+                        info->list[i].map.phys = NO_XIP;
+
                 if (probe_type) {
                         info->list[i].mtd = do_map_probe(probe_type,
                                                          &info->list[i].map);
diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c
index 6f52e1f288b6..49c3fe715eee 100644
--- a/drivers/mtd/maps/rbtx4939-flash.c
+++ b/drivers/mtd/maps/rbtx4939-flash.c
@@ -100,8 +100,6 @@ static int rbtx4939_flash_probe(struct platform_device *dev)
                 goto err_out;
         }
         info->mtd->owner = THIS_MODULE;
-        if (err)
-                goto err_out;
         err = mtd_device_parse_register(info->mtd, NULL, NULL, pdata->parts,
                                         pdata->nr_parts);
 
diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index c3bb304eca07..299bf88a6f41 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -67,10 +67,16 @@ static int __init uclinux_mtd_init(void)
         printk("uclinux[mtd]: RAM probe address=0x%x size=0x%x\n",
                 (int) mapp->phys, (int) mapp->size);
 
-        mapp->virt = ioremap_nocache(mapp->phys, mapp->size);
+        /*
+         * The filesystem is guaranteed to be in direct mapped memory. It is
+         * directly following the kernels own bss region. Following the same
+         * mechanism used by architectures setting up traditional initrds we
+         * use phys_to_virt to get the virtual address of its start.
+         */
+        mapp->virt = phys_to_virt(mapp->phys);
 
         if (mapp->virt == 0) {
-                printk("uclinux[mtd]: ioremap_nocache() failed\n");
+                printk("uclinux[mtd]: no virtual mapping?\n");
                 return(-EIO);
         }
 
@@ -79,7 +85,6 @@ static int __init uclinux_mtd_init(void)
         mtd = do_map_probe("map_ram", mapp);
         if (!mtd) {
                 printk("uclinux[mtd]: failed to find a mapping?\n");
-                iounmap(mapp->virt);
                 return(-ENXIO);
         }
 
@@ -102,10 +107,8 @@ static void __exit uclinux_mtd_cleanup(void)
                 map_destroy(uclinux_ram_mtdinfo);
                 uclinux_ram_mtdinfo = NULL;
         }
-        if (uclinux_ram_map.virt) {
-                iounmap((void *) uclinux_ram_map.virt);
+        if (uclinux_ram_map.virt)
                 uclinux_ram_map.virt = 0;
-        }
 }
 
 /****************************************************************************/
diff --git a/drivers/mtd/maps/wr_sbc82xx_flash.c b/drivers/mtd/maps/wr_sbc82xx_flash.c
deleted file mode 100644
index e7534c82f93a..000000000000
--- a/drivers/mtd/maps/wr_sbc82xx_flash.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Map for flash chips on Wind River PowerQUICC II SBC82xx board.
- *
- * Copyright (C) 2004 Red Hat, Inc.
- *
- * Author: David Woodhouse <dwmw2@infradead.org>
- *
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <asm/io.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/immap_cpm2.h>
-
-static struct mtd_info *sbcmtd[3];
-
-struct map_info sbc82xx_flash_map[3] = {
-        {.name = "Boot flash"},
-        {.name = "Alternate boot flash"},
-        {.name = "User flash"}
-};
-
-static struct mtd_partition smallflash_parts[] = {
-        {
-                .name =         "space",
-                .size =         0x100000,
-                .offset =       0,
-        }, {
-                .name =         "bootloader",
-                .size =         MTDPART_SIZ_FULL,
-                .offset =       MTDPART_OFS_APPEND,
-        }
-};
-
-static struct mtd_partition bigflash_parts[] = {
-        {
-                .name =         "bootloader",
-                .size =         0x00100000,
-                .offset =       0,
-        }, {
-                .name =         "file system",
-                .size =         0x01f00000,
-                .offset =       MTDPART_OFS_APPEND,
-        }, {
-                .name =         "boot config",
-                .size =         0x00100000,
-                .offset =       MTDPART_OFS_APPEND,
-        }, {
-                .name =         "space",
-                .size =         0x01f00000,
-                .offset =       MTDPART_OFS_APPEND,
-        }
-};
-
-static const char *part_probes[] __initconst = {"cmdlinepart", "RedBoot", NULL};
-
-#define init_sbc82xx_one_flash(map, br, or)                     \
-do {                                                            \
-        (map).phys = (br & 1) ? (br & 0xffff8000) : 0;          \
-        (map).size = (br & 1) ? (~(or & 0xffff8000) + 1) : 0;   \
-        switch (br & 0x00001800) {                              \
-        case 0x00000000:                                        \
-        case 0x00000800:        (map).bankwidth = 1;    break;  \
-        case 0x00001000:        (map).bankwidth = 2;    break;  \
-        case 0x00001800:        (map).bankwidth = 4;    break;  \
-        }                                                       \
-} while (0);
-
-static int __init init_sbc82xx_flash(void)
-{
-        volatile memctl_cpm2_t *mc = &cpm2_immr->im_memctl;
-        int bigflash;
-        int i;
-
-#ifdef CONFIG_SBC8560
-        mc = ioremap(0xff700000 + 0x5000, sizeof(memctl_cpm2_t));
-#else
-        mc = &cpm2_immr->im_memctl;
-#endif
-
-        bigflash = 1;
-        if ((mc->memc_br0 & 0x00001800) == 0x00001800)
-                bigflash = 0;
-
-        init_sbc82xx_one_flash(sbc82xx_flash_map[0], mc->memc_br0, mc->memc_or0);
-        init_sbc82xx_one_flash(sbc82xx_flash_map[1], mc->memc_br6, mc->memc_or6);
-        init_sbc82xx_one_flash(sbc82xx_flash_map[2], mc->memc_br1, mc->memc_or1);
-
-#ifdef CONFIG_SBC8560
-        iounmap((void *) mc);
-#endif
-
-        for (i=0; i<3; i++) {
-                int8_t flashcs[3] = { 0, 6, 1 };
-                int nr_parts;
-                struct mtd_partition *defparts;
-
-                printk(KERN_NOTICE "PowerQUICC II %s (%ld MiB on CS%d",
-                       sbc82xx_flash_map[i].name,
-                       (sbc82xx_flash_map[i].size >> 20),
-                       flashcs[i]);
-                if (!sbc82xx_flash_map[i].phys) {
-                        /* We know it can't be at zero. */
-                        printk("): disabled by bootloader.\n");
-                        continue;
-                }
-                printk(" at %08lx)\n",  sbc82xx_flash_map[i].phys);
-
-                sbc82xx_flash_map[i].virt = ioremap(sbc82xx_flash_map[i].phys,
-                                                    sbc82xx_flash_map[i].size);
-
-                if (!sbc82xx_flash_map[i].virt) {
-                        printk("Failed to ioremap\n");
-                        continue;
-                }
-
-                simple_map_init(&sbc82xx_flash_map[i]);
-
-                sbcmtd[i] = do_map_probe("cfi_probe", &sbc82xx_flash_map[i]);
-
-                if (!sbcmtd[i])
-                        continue;
-
-                sbcmtd[i]->owner = THIS_MODULE;
-
-                /* No partitioning detected. Use default */
-                if (i == 2) {
-                        defparts = NULL;
-                        nr_parts = 0;
-                } else if (i == bigflash) {
-                        defparts = bigflash_parts;
-                        nr_parts = ARRAY_SIZE(bigflash_parts);
-                } else {
-                        defparts = smallflash_parts;
-                        nr_parts = ARRAY_SIZE(smallflash_parts);
-                }
-
-                mtd_device_parse_register(sbcmtd[i], part_probes, NULL,
-                                          defparts, nr_parts);
-        }
-        return 0;
-}
-
-static void __exit cleanup_sbc82xx_flash(void)
-{
-        int i;
-
-        for (i=0; i<3; i++) {
-                if (!sbcmtd[i])
-                        continue;
-
-                mtd_device_unregister(sbcmtd[i]);
-
-                map_destroy(sbcmtd[i]);
-
-                iounmap((void *)sbc82xx_flash_map[i].virt);
-                sbc82xx_flash_map[i].virt = 0;
-        }
-}
-
-module_init(init_sbc82xx_flash);
-module_exit(cleanup_sbc82xx_flash);
-
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
-MODULE_DESCRIPTION("Flash map driver for WindRiver PowerQUICC II");