Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (53 commits)
  [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
  [MTD] [NOR] Fixup for Numonyx M29W128 chips
  [MTD] mtdpart: Make ecc_stats more realistic.
  powerpc/85xx: TQM8548: Update DTS file for multi-chip support
  powerpc: NAND: FSL UPM: document new bindings
  [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays
  [MTD] [NAND] FSL-UPM: add multi chip support
  [MTD] [NOR] Add device parent info to physmap_of
  [MTD] [NAND] Add support for NAND on the Socrates board
  [MTD] [NAND] Add support for 4KiB pages.
  [MTD] sysfs support should not depend on CONFIG_PROC_FS
  [MTD] [NAND] Add parent info for CAFÉ controller
  [MTD] support driver model updates
  [MTD] driver model updates (part 2)
  [MTD] driver model updates
  [MTD] [NAND] move gen_nand's probe function to .devinit.text
  [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text
  [MTD] fix use after free in register_mtd_blktrans
  [MTD] [MAPS] Drop now unused sharpsl-flash map
  [MTD] ofpart: Check name property to determine partition nodes.
  ...

Manually fix trivial conflict in drivers/mtd/maps/Makefile

9 files changed, 221 insertions, 124 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 729f899a5cd5..82923bd2d9c5 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -529,12 +529,6 @@ config MTD_DMV182
         help
           Map driver for Dy-4 SVME/DMV-182 board.
 
-config MTD_SHARP_SL
-        tristate "ROM mapped on Sharp SL Series"
-        depends on ARCH_PXA
-        help
-          This enables access to the flash chip on the Sharp SL Series of PDAs.
-
 config MTD_INTEL_VR_NOR
         tristate "NOR flash on Intel Vermilion Range Expansion Bus CS0"
         depends on PCI
@@ -542,6 +536,12 @@ config MTD_INTEL_VR_NOR
           Map driver for a NOR flash bank located on the Expansion Bus of the
           Intel Vermilion Range chipset.
 
+config MTD_RBTX4939
+        tristate "Map driver for RBTX4939 board"
+        depends on TOSHIBA_RBTX4939 && MTD_CFI && MTD_COMPLEX_MAPPINGS
+        help
+          Map driver for NOR flash chips on RBTX4939 board.
+
 config MTD_PLATRAM
         tristate "Map driver for platform device RAM (mtd-ram)"
         select MTD_RAM
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 26b28a7a90b5..2dbc1bec8488 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -56,9 +56,9 @@ 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_SHARP_SL)      += sharpsl-flash.o
 obj-$(CONFIG_MTD_PLATRAM)       += plat-ram.o
 obj-$(CONFIG_MTD_OMAP_NOR)      += omap_nor.o
 obj-$(CONFIG_MTD_INTEL_VR_NOR)  += intel_vr_nor.o
 obj-$(CONFIG_MTD_BFIN_ASYNC)    += bfin-async-flash.o
+obj-$(CONFIG_MTD_RBTX4939)      += rbtx4939-flash.o
 obj-$(CONFIG_MTD_VMU)           += vmu-flash.o
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index 7e50e9b1b781..a24478102b11 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -115,6 +115,8 @@ static int __init omapflash_probe(struct platform_device *pdev)
         }
         info->mtd->owner = THIS_MODULE;
 
+        info->mtd->dev.parent = &pdev->dev;
+
 #ifdef CONFIG_MTD_PARTITIONS
         err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0);
         if (err > 0)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 229718222db7..29a901157352 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -147,6 +147,7 @@ static int physmap_flash_probe(struct platform_device *dev)
                         devices_found++;
                 }
                 info->mtd[i]->owner = THIS_MODULE;
+                info->mtd[i]->dev.parent = &dev->dev;
         }
 
         if (devices_found == 1) {
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index fbf0ca939d72..c83a60fada53 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -219,6 +219,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
                 goto err_out;
         }
         info->mtd->owner = THIS_MODULE;
+        info->mtd->dev.parent = &dev->dev;
 
 #ifdef CONFIG_MTD_PARTITIONS
         /* First look for RedBoot table or partitions on the command
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index e7dd9c8a965e..49c9ece76477 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -224,6 +224,7 @@ static int platram_probe(struct platform_device *pdev)
         }
 
         info->mtd->owner = THIS_MODULE;
+        info->mtd->dev.parent = &pdev->dev;
 
         platram_setrw(info, PLATRAM_RW);
 
diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c
new file mode 100644
index 000000000000..d39f0adac846
--- /dev/null
+++ b/drivers/mtd/maps/rbtx4939-flash.c
@@ -0,0 +1,208 @@
+/*
+ * rbtx4939-flash (based on physmap.c)
+ *
+ * This is a simplified physmap driver with map_init callback function.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Copyright (C) 2009 Atsushi Nemoto <anemo@mba.ocn.ne.jp>
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/partitions.h>
+#include <asm/txx9/rbtx4939.h>
+
+struct rbtx4939_flash_info {
+        struct mtd_info *mtd;
+        struct map_info map;
+#ifdef CONFIG_MTD_PARTITIONS
+        int nr_parts;
+        struct mtd_partition *parts;
+#endif
+};
+
+static int rbtx4939_flash_remove(struct platform_device *dev)
+{
+        struct rbtx4939_flash_info *info;
+
+        info = platform_get_drvdata(dev);
+        if (!info)
+                return 0;
+        platform_set_drvdata(dev, NULL);
+
+        if (info->mtd) {
+#ifdef CONFIG_MTD_PARTITIONS
+                struct rbtx4939_flash_data *pdata = dev->dev.platform_data;
+
+                if (info->nr_parts) {
+                        del_mtd_partitions(info->mtd);
+                        kfree(info->parts);
+                } else if (pdata->nr_parts)
+                        del_mtd_partitions(info->mtd);
+                else
+                        del_mtd_device(info->mtd);
+#else
+                del_mtd_device(info->mtd);
+#endif
+                map_destroy(info->mtd);
+        }
+        return 0;
+}
+
+static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
+#ifdef CONFIG_MTD_PARTITIONS
+static const char *part_probe_types[] = { "cmdlinepart", NULL };
+#endif
+
+static int rbtx4939_flash_probe(struct platform_device *dev)
+{
+        struct rbtx4939_flash_data *pdata;
+        struct rbtx4939_flash_info *info;
+        struct resource *res;
+        const char **probe_type;
+        int err = 0;
+        unsigned long size;
+
+        pdata = dev->dev.platform_data;
+        if (!pdata)
+                return -ENODEV;
+
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENODEV;
+        info = devm_kzalloc(&dev->dev, sizeof(struct rbtx4939_flash_info),
+                            GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        platform_set_drvdata(dev, info);
+
+        size = resource_size(res);
+        pr_notice("rbtx4939 platform flash device: %pR\n", res);
+
+        if (!devm_request_mem_region(&dev->dev, res->start, size,
+                                     dev_name(&dev->dev)))
+                return -EBUSY;
+
+        info->map.name = dev_name(&dev->dev);
+        info->map.phys = res->start;
+        info->map.size = size;
+        info->map.bankwidth = pdata->width;
+
+        info->map.virt = devm_ioremap(&dev->dev, info->map.phys, size);
+        if (!info->map.virt)
+                return -EBUSY;
+
+        if (pdata->map_init)
+                (*pdata->map_init)(&info->map);
+        else
+                simple_map_init(&info->map);
+
+        probe_type = rom_probe_types;
+        for (; !info->mtd && *probe_type; probe_type++)
+                info->mtd = do_map_probe(*probe_type, &info->map);
+        if (!info->mtd) {
+                dev_err(&dev->dev, "map_probe failed\n");
+                err = -ENXIO;
+                goto err_out;
+        }
+        info->mtd->owner = THIS_MODULE;
+        if (err)
+                goto err_out;
+
+#ifdef CONFIG_MTD_PARTITIONS
+        err = parse_mtd_partitions(info->mtd, part_probe_types,
+                                &info->parts, 0);
+        if (err > 0) {
+                add_mtd_partitions(info->mtd, info->parts, err);
+                info->nr_parts = err;
+                return 0;
+        }
+
+        if (pdata->nr_parts) {
+                pr_notice("Using rbtx4939 partition information\n");
+                add_mtd_partitions(info->mtd, pdata->parts, pdata->nr_parts);
+                return 0;
+        }
+#endif
+
+        add_mtd_device(info->mtd);
+        return 0;
+
+err_out:
+        rbtx4939_flash_remove(dev);
+        return err;
+}
+
+#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);
+
+        if (info->mtd->suspend && info->mtd->resume)
+                if (info->mtd->suspend(info->mtd) == 0)
+                        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",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init rbtx4939_flash_init(void)
+{
+        return platform_driver_register(&rbtx4939_flash_driver);
+}
+
+static void __exit rbtx4939_flash_exit(void)
+{
+        platform_driver_unregister(&rbtx4939_flash_driver);
+}
+
+module_init(rbtx4939_flash_init);
+module_exit(rbtx4939_flash_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("RBTX4939 MTD map driver");
+MODULE_ALIAS("platform:rbtx4939-flash");
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 8f57b6f40aa2..05e9362dc7f0 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -351,7 +351,7 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
 
 static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
 
-static int __init sa1100_mtd_probe(struct platform_device *pdev)
+static int __devinit sa1100_mtd_probe(struct platform_device *pdev)
 {
         struct flash_platform_data *plat = pdev->dev.platform_data;
         struct mtd_partition *parts;
diff --git a/drivers/mtd/maps/sharpsl-flash.c b/drivers/mtd/maps/sharpsl-flash.c
deleted file mode 100644
index b392f096c706..000000000000
--- a/drivers/mtd/maps/sharpsl-flash.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * sharpsl-flash.c
- *
- * Copyright (C) 2001 Lineo Japan, Inc.
- * Copyright (C) 2002  SHARP
- *
- * based on rpxlite.c,v 1.15 2001/10/02 15:05:14 dwmw2 Exp
- *          Handle mapping of the flash on the RPX Lite and CLLF boards
- *
- * 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 program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#include <asm/io.h>
-#include <asm/mach-types.h>
-
-#define WINDOW_ADDR 0x00000000
-#define WINDOW_SIZE 0x00800000
-#define BANK_WIDTH 2
-
-static struct mtd_info *mymtd;
-
-struct map_info sharpsl_map = {
-        .name = "sharpsl-flash",
-        .size = WINDOW_SIZE,
-        .bankwidth = BANK_WIDTH,
-        .phys = WINDOW_ADDR
-};
-
-static struct mtd_partition sharpsl_partitions[1] = {
-        {
-                name:           "Boot PROM Filesystem",
-        }
-};
-
-static int __init init_sharpsl(void)
-{
-        struct mtd_partition *parts;
-        int nb_parts = 0;
-        char *part_type = "static";
-
-        printk(KERN_NOTICE "Sharp SL series flash device: %x at %x\n",
-                WINDOW_SIZE, WINDOW_ADDR);
-        sharpsl_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
-        if (!sharpsl_map.virt) {
-                printk("Failed to ioremap\n");
-                return -EIO;
-        }
-
-        simple_map_init(&sharpsl_map);
-
-        mymtd = do_map_probe("map_rom", &sharpsl_map);
-        if (!mymtd) {
-                iounmap(sharpsl_map.virt);
-                return -ENXIO;
-        }
-
-        mymtd->owner = THIS_MODULE;
-
-        if (machine_is_corgi() || machine_is_shepherd() || machine_is_husky()
-                || machine_is_poodle()) {
-                sharpsl_partitions[0].size=0x006d0000;
-                sharpsl_partitions[0].offset=0x00120000;
-        } else if (machine_is_tosa()) {
-                sharpsl_partitions[0].size=0x006a0000;
-                sharpsl_partitions[0].offset=0x00160000;
-        } else if (machine_is_spitz() || machine_is_akita() || machine_is_borzoi()) {
-                sharpsl_partitions[0].size=0x006b0000;
-                sharpsl_partitions[0].offset=0x00140000;
-        } else {
-                map_destroy(mymtd);
-                iounmap(sharpsl_map.virt);
-                return -ENODEV;
-        }
-
-        parts = sharpsl_partitions;
-        nb_parts = ARRAY_SIZE(sharpsl_partitions);
-
-        printk(KERN_NOTICE "Using %s partition definition\n", part_type);
-        add_mtd_partitions(mymtd, parts, nb_parts);
-
-        return 0;
-}
-
-static void __exit cleanup_sharpsl(void)
-{
-        if (mymtd) {
-                del_mtd_partitions(mymtd);
-                map_destroy(mymtd);
-        }
-        if (sharpsl_map.virt) {
-                iounmap(sharpsl_map.virt);
-                sharpsl_map.virt = 0;
-        }
-}
-
-module_init(init_sharpsl);
-module_exit(cleanup_sharpsl);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("SHARP (Original: Arnold Christensen <AKC@pel.dk>)");
-MODULE_DESCRIPTION("MTD map driver for SHARP SL series");