7 files changed, 19 insertions, 487 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 847e214ade59..4c364d44ad59 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -359,12 +359,6 @@ config MTD_SA1100
          the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.
          If you have such a board, say 'Y'.
-config MTD_IPAQ
-        tristate "CFI Flash device mapped on Compaq/HP iPAQ"
-        depends on IPAQ_HANDHELD && MTD_CFI
-        help
-          This provides a driver for the on-board flash of the iPAQ.
 config MTD_DC21285
        tristate "CFI Flash device mapped on DC21285 Footbridge"
        depends on MTD_CFI && ARCH_FOOTBRIDGE && MTD_COMPLEX_MAPPINGS
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index ae2f6dbe43c3..ce315214ff2b 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -24,12 +24,12 @@ obj-$(CONFIG_MTD_CEIVA)		+= ceiva.o
 obj-$(CONFIG_MTD_OCTAGON)       += octagon-5066.o
 obj-$(CONFIG_MTD_PHYSMAP)       += physmap.o
 obj-$(CONFIG_MTD_PHYSMAP_OF)    += physmap_of.o
+obj-$(CONFIG_MTD_PISMO)         += pismo.o
 obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcmsp-flash.o
 obj-$(CONFIG_MTD_PCMCIA)        += pcmciamtd.o
 obj-$(CONFIG_MTD_RPXLITE)       += rpxlite.o
 obj-$(CONFIG_MTD_TQM8XXL)       += tqm8xxl.o
 obj-$(CONFIG_MTD_SA1100)        += sa1100-flash.o
-obj-$(CONFIG_MTD_IPAQ)          += ipaq-flash.o
 obj-$(CONFIG_MTD_SBC_GXX)       += sbc_gxx.o
 obj-$(CONFIG_MTD_SC520CDP)      += sc520cdp.o
 obj-$(CONFIG_MTD_NETSC520)      += netsc520.o
diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c
deleted file mode 100644
index 76708e796b70..000000000000
--- a/drivers/mtd/maps/ipaq-flash.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Flash memory access on iPAQ Handhelds (either SA1100 or PXA250 based)
- *
- * (C) 2000 Nicolas Pitre <nico@fluxnic.net>
- * (C) 2002 Hewlett-Packard Company <jamey.hicks@hp.com>
- * (C) 2003 Christian Pellegrin <chri@ascensit.com>, <chri@infis.univ.ts.it>: concatenation of multiple flashes
- */
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <asm/page.h>
-#include <asm/mach-types.h>
-#include <asm/system.h>
-#include <asm/errno.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#ifdef CONFIG_MTD_CONCAT
-#include <linux/mtd/concat.h>
-#endif
-#include <mach/hardware.h>
-#include <mach/h3600.h>
-#include <asm/io.h>
-#ifndef CONFIG_IPAQ_HANDHELD
-#error This is for iPAQ Handhelds only
-#endif
-#ifdef CONFIG_SA1100_JORNADA56X
-static void jornada56x_set_vpp(struct map_info *map, int vpp)
-{
-        if (vpp)
-                GPSR = GPIO_GPIO26;
-        else
-                GPCR = GPIO_GPIO26;
-        GPDR |= GPIO_GPIO26;
-}
-#endif
-#ifdef CONFIG_SA1100_JORNADA720
-static void jornada720_set_vpp(struct map_info *map, int vpp)
-{
-        if (vpp)
-                PPSR |= 0x80;
-        else
-                PPSR &= ~0x80;
-        PPDR |= 0x80;
-}
-#endif
-#define MAX_IPAQ_CS 2           /* Number of CS we are going to test */
-#define IPAQ_MAP_INIT(X) \
-        { \
-                name:           "IPAQ flash " X, \
-        }
-static struct map_info ipaq_map[MAX_IPAQ_CS] = {
-        IPAQ_MAP_INIT("bank 1"),
-        IPAQ_MAP_INIT("bank 2")
-};
-static struct mtd_info *my_sub_mtd[MAX_IPAQ_CS] = {
-        NULL,
-        NULL
-};
-/*
- * Here are partition information for all known IPAQ-based devices.
- * See include/linux/mtd/partitions.h for definition of the mtd_partition
- * structure.
- *
- * The *_max_flash_size is the maximum possible mapped flash size which
- * is not necessarily the actual flash size.  It must be no more than
- * the value specified in the "struct map_desc *_io_desc" mapping
- * definition for the corresponding machine.
- *
- * Please keep these in alphabetical order, and formatted as per existing
- * entries.  Thanks.
- */
-#ifdef CONFIG_IPAQ_HANDHELD
-static unsigned long h3xxx_max_flash_size = 0x04000000;
-static struct mtd_partition h3xxx_partitions[] = {
-        {
-                name:           "H3XXX boot firmware",
-#ifndef CONFIG_LAB
-                size:           0x00040000,
-#else
-                size:           0x00080000,
-#endif
-                offset:         0,
-#ifndef CONFIG_LAB
-                mask_flags:     MTD_WRITEABLE,  /* force read-only */
-#endif
-        },
-        {
-                name:           "H3XXX root jffs2",
-#ifndef CONFIG_LAB
-                size:           0x2000000 - 2*0x40000, /* Warning, this is fixed later */
-                offset:         0x00040000,
-#else
-                size:           0x2000000 - 0x40000 - 0x80000, /* Warning, this is fixed later */
-                offset:         0x00080000,
-#endif
-        },
-        {
-                name:           "asset",
-                size:           0x40000,
-                offset:         0x2000000 - 0x40000, /* Warning, this is fixed later */
-                mask_flags:     MTD_WRITEABLE,  /* force read-only */
-        }
-};
-#ifndef CONFIG_MTD_CONCAT
-static struct mtd_partition h3xxx_partitions_bank2[] = {
-        /* this is used only on 2 CS machines when concat is not present */
-        {
-                name:           "second H3XXX root jffs2",
-                size:           0x1000000 - 0x40000, /* Warning, this is fixed later */
-                offset:         0x00000000,
-        },
-        {
-                name:           "second asset",
-                size:           0x40000,
-                offset:         0x1000000 - 0x40000, /* Warning, this is fixed later */
-                mask_flags:     MTD_WRITEABLE,  /* force read-only */
-        }
-};
-#endif
-static DEFINE_SPINLOCK(ipaq_vpp_lock);
-static void h3xxx_set_vpp(struct map_info *map, int vpp)
-{
-        static int nest = 0;
-        spin_lock(&ipaq_vpp_lock);
-        if (vpp)
-                nest++;
-        else
-                nest--;
-        if (nest)
-                assign_h3600_egpio(IPAQ_EGPIO_VPP_ON, 1);
-        else
-                assign_h3600_egpio(IPAQ_EGPIO_VPP_ON, 0);
-        spin_unlock(&ipaq_vpp_lock);
-}
-#endif
-#if defined(CONFIG_SA1100_JORNADA56X) || defined(CONFIG_SA1100_JORNADA720)
-static unsigned long jornada_max_flash_size = 0x02000000;
-static struct mtd_partition jornada_partitions[] = {
-        {
-                name:           "Jornada boot firmware",
-                size:           0x00040000,
-                offset:         0,
-                mask_flags:     MTD_WRITEABLE,  /* force read-only */
-        }, {
-                name:           "Jornada root jffs2",
-                size:           MTDPART_SIZ_FULL,
-                offset:         0x00040000,
-        }
-};
-#endif
-static struct mtd_partition *parsed_parts;
-static struct mtd_info *mymtd;
-static unsigned long cs_phys[] = {
-#ifdef CONFIG_ARCH_SA1100
-        SA1100_CS0_PHYS,
-        SA1100_CS1_PHYS,
-        SA1100_CS2_PHYS,
-        SA1100_CS3_PHYS,
-        SA1100_CS4_PHYS,
-        SA1100_CS5_PHYS,
-#else
-        PXA_CS0_PHYS,
-        PXA_CS1_PHYS,
-        PXA_CS2_PHYS,
-        PXA_CS3_PHYS,
-        PXA_CS4_PHYS,
-        PXA_CS5_PHYS,
-#endif
-};
-static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
-static int __init h1900_special_case(void);
-static int __init ipaq_mtd_init(void)
-{
-        struct mtd_partition *parts = NULL;
-        int nb_parts = 0;
-        int parsed_nr_parts = 0;
-        const char *part_type;
-        int i; /* used when we have >1 flash chips */
-        unsigned long tot_flashsize = 0; /* used when we have >1 flash chips */
-        /* Default flash bankwidth */
-        // ipaq_map.bankwidth = (MSC0 & MSC_RBW) ? 2 : 4;
-        if (machine_is_h1900())
-        {
-                /* For our intents, the h1900 is not a real iPAQ, so we special-case it. */
-                return h1900_special_case();
-        }
-        if (machine_is_h3100() || machine_is_h1900())
-                for(i=0; i<MAX_IPAQ_CS; i++)
-                        ipaq_map[i].bankwidth = 2;
-        else
-                for(i=0; i<MAX_IPAQ_CS; i++)
-                        ipaq_map[i].bankwidth = 4;
-        /*
-         * Static partition definition selection
-         */
-        part_type = "static";
-        simple_map_init(&ipaq_map[0]);
-        simple_map_init(&ipaq_map[1]);
-#ifdef CONFIG_IPAQ_HANDHELD
-        if (machine_is_ipaq()) {
-                parts = h3xxx_partitions;
-                nb_parts = ARRAY_SIZE(h3xxx_partitions);
-                for(i=0; i<MAX_IPAQ_CS; i++) {
-                        ipaq_map[i].size = h3xxx_max_flash_size;
-                        ipaq_map[i].set_vpp = h3xxx_set_vpp;
-                        ipaq_map[i].phys = cs_phys[i];
-                        ipaq_map[i].virt = ioremap(cs_phys[i], 0x04000000);
-                        if (machine_is_h3100 () || machine_is_h1900())
-                                ipaq_map[i].bankwidth = 2;
-                }
-                if (machine_is_h3600()) {
-                        /* No asset partition here */
-                        h3xxx_partitions[1].size += 0x40000;
-                        nb_parts--;
-                }
-        }
-#endif
-#ifdef CONFIG_ARCH_H5400
-        if (machine_is_h5400()) {
-                ipaq_map[0].size = 0x02000000;
-                ipaq_map[1].size = 0x02000000;
-                ipaq_map[1].phys = 0x02000000;
-                ipaq_map[1].virt = ipaq_map[0].virt + 0x02000000;
-        }
-#endif
-#ifdef CONFIG_ARCH_H1900
-        if (machine_is_h1900()) {
-                ipaq_map[0].size = 0x00400000;
-                ipaq_map[1].size = 0x02000000;
-                ipaq_map[1].phys = 0x00080000;
-                ipaq_map[1].virt = ipaq_map[0].virt + 0x00080000;
-        }
-#endif
-#ifdef CONFIG_SA1100_JORNADA56X
-        if (machine_is_jornada56x()) {
-                parts = jornada_partitions;
-                nb_parts = ARRAY_SIZE(jornada_partitions);
-                ipaq_map[0].size = jornada_max_flash_size;
-                ipaq_map[0].set_vpp = jornada56x_set_vpp;
-                ipaq_map[0].virt = (__u32)ioremap(0x0, 0x04000000);
-        }
-#endif
-#ifdef CONFIG_SA1100_JORNADA720
-        if (machine_is_jornada720()) {
-                parts = jornada_partitions;
-                nb_parts = ARRAY_SIZE(jornada_partitions);
-                ipaq_map[0].size = jornada_max_flash_size;
-                ipaq_map[0].set_vpp = jornada720_set_vpp;
-        }
-#endif
-        if (machine_is_ipaq()) { /* for iPAQs only */
-                for(i=0; i<MAX_IPAQ_CS; i++) {
-                        printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with CFI.\n", ipaq_map[i].bankwidth*8, ipaq_map[i].virt);
-                        my_sub_mtd[i] = do_map_probe("cfi_probe", &ipaq_map[i]);
-                        if (!my_sub_mtd[i]) {
-                                printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[i].bankwidth*8, ipaq_map[i].virt);
-                                my_sub_mtd[i] = do_map_probe("jedec_probe", &ipaq_map[i]);
-                        }
-                        if (!my_sub_mtd[i]) {
-                                printk(KERN_NOTICE "iPAQ flash: failed to find flash.\n");
-                                if (i)
-                                        break;
-                                else
-                                        return -ENXIO;
-                        } else
-                                printk(KERN_NOTICE "iPAQ flash: found %d bytes\n", my_sub_mtd[i]->size);
-                        /* do we really need this debugging? --joshua 20030703 */
-                        // printk("my_sub_mtd[%d]=%p\n", i, my_sub_mtd[i]);
-                        my_sub_mtd[i]->owner = THIS_MODULE;
-                        tot_flashsize += my_sub_mtd[i]->size;
-                }
-#ifdef CONFIG_MTD_CONCAT
-                /* fix the asset location */
-#       ifdef CONFIG_LAB
-                h3xxx_partitions[1].size = tot_flashsize - 0x40000 - 0x80000 /* extra big boot block */;
-#       else
-                h3xxx_partitions[1].size = tot_flashsize - 2 * 0x40000;
-#       endif
-                h3xxx_partitions[2].offset = tot_flashsize - 0x40000;
-                /* and concat the devices */
-                mymtd = mtd_concat_create(&my_sub_mtd[0], i,
-                                          "ipaq");
-                if (!mymtd) {
-                        printk("Cannot create iPAQ concat device\n");
-                        return -ENXIO;
-                }
-#else
-                mymtd = my_sub_mtd[0];
-                /*
-                 *In the very near future, command line partition parsing
-                 * will use the device name as 'mtd-id' instead of a value
-                 * passed to the parse_cmdline_partitions() routine. Since
-                 * the bootldr says 'ipaq', make sure it continues to work.
-                 */
-                mymtd->name = "ipaq";
-                if ((machine_is_h3600())) {
-#       ifdef CONFIG_LAB
-                        h3xxx_partitions[1].size = my_sub_mtd[0]->size - 0x80000;
-#       else
-                        h3xxx_partitions[1].size = my_sub_mtd[0]->size - 0x40000;
-#       endif
-                        nb_parts = 2;
-                } else {
-#       ifdef CONFIG_LAB
-                        h3xxx_partitions[1].size = my_sub_mtd[0]->size - 0x40000 - 0x80000; /* extra big boot block */
-#       else
-                        h3xxx_partitions[1].size = my_sub_mtd[0]->size - 2*0x40000;
-#       endif
-                        h3xxx_partitions[2].offset = my_sub_mtd[0]->size - 0x40000;
-                }
-                if (my_sub_mtd[1]) {
-#       ifdef CONFIG_LAB
-                        h3xxx_partitions_bank2[0].size = my_sub_mtd[1]->size - 0x80000;
-#       else
-                        h3xxx_partitions_bank2[0].size = my_sub_mtd[1]->size - 0x40000;
-#       endif
-                        h3xxx_partitions_bank2[1].offset = my_sub_mtd[1]->size - 0x40000;
-                }
-#endif
-        }
-        else {
-                /*
-                 * Now let's probe for the actual flash.  Do it here since
-                 * specific machine settings might have been set above.
-                 */
-                printk(KERN_NOTICE "IPAQ flash: probing %d-bit flash bus, window=%lx\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);
-                mymtd = do_map_probe("cfi_probe", &ipaq_map[0]);
-                if (!mymtd)
-                        return -ENXIO;
-                mymtd->owner = THIS_MODULE;
-        }
-        /*
-         * Dynamic partition selection stuff (might override the static ones)
-         */
-         i = parse_mtd_partitions(mymtd, part_probes, &parsed_parts, 0);
-         if (i > 0) {
-                 nb_parts = parsed_nr_parts = i;
-                 parts = parsed_parts;
-                 part_type = "dynamic";
-         }
-         if (!parts) {
-                 printk(KERN_NOTICE "IPAQ flash: no partition info available, registering whole flash at once\n");
-                 add_mtd_device(mymtd);
-#ifndef CONFIG_MTD_CONCAT
-                 if (my_sub_mtd[1])
-                         add_mtd_device(my_sub_mtd[1]);
-#endif
-         } else {
-                 printk(KERN_NOTICE "Using %s partition definition\n", part_type);
-                 add_mtd_partitions(mymtd, parts, nb_parts);
-#ifndef CONFIG_MTD_CONCAT
-                 if (my_sub_mtd[1])
-                         add_mtd_partitions(my_sub_mtd[1], h3xxx_partitions_bank2, ARRAY_SIZE(h3xxx_partitions_bank2));
-#endif
-         }
-         return 0;
-}
-static void __exit ipaq_mtd_cleanup(void)
-{
-        int i;
-        if (mymtd) {
-                del_mtd_partitions(mymtd);
-#ifndef CONFIG_MTD_CONCAT
-                if (my_sub_mtd[1])
-                        del_mtd_partitions(my_sub_mtd[1]);
-#endif
-                map_destroy(mymtd);
-#ifdef CONFIG_MTD_CONCAT
-                for(i=0; i<MAX_IPAQ_CS; i++)
-#else
-                        for(i=1; i<MAX_IPAQ_CS; i++)
-#endif
-                        {
-                                if (my_sub_mtd[i])
-                                        map_destroy(my_sub_mtd[i]);
-                        }
-                kfree(parsed_parts);
-        }
-}
-static int __init h1900_special_case(void)
-{
-        /* The iPAQ h1900 is a special case - it has weird ROM. */
-        simple_map_init(&ipaq_map[0]);
-        ipaq_map[0].size = 0x80000;
-        ipaq_map[0].set_vpp = h3xxx_set_vpp;
-        ipaq_map[0].phys = 0x0;
-        ipaq_map[0].virt = ioremap(0x0, 0x04000000);
-        ipaq_map[0].bankwidth = 2;
-        printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);
-        mymtd = do_map_probe("jedec_probe", &ipaq_map[0]);
-        if (!mymtd)
-                return -ENODEV;
-        add_mtd_device(mymtd);
-        printk(KERN_NOTICE "iPAQ flash: registered h1910 flash\n");
-        return 0;
-}
-module_init(ipaq_mtd_init);
-module_exit(ipaq_mtd_cleanup);
-MODULE_AUTHOR("Jamey Hicks");
-MODULE_DESCRIPTION("IPAQ CFI map driver");
-MODULE_LICENSE("MIT");
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 7214b876feba..7b0515297411 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -210,7 +210,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
         * not attempt to do a direct access on us.
         */
        info->map.phys = NO_XIP;
-        info->map.size = dev->resource->end - dev->resource->start + 1;
+        info->map.size = resource_size(dev->resource);
        /*
         * We only support 16-bit accesses for now. If and when
@@ -224,7 +224,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
        info->map.copy_from = ixp4xx_copy_from,
        info->res = request_mem_region(dev->resource->start,
-                        dev->resource->end - dev->resource->start + 1,
+                        resource_size(dev->resource),
                        "IXP4XXFlash");
        if (!info->res) {
                printk(KERN_ERR "IXP4XXFlash: Could not reserve memory region\n");
@@ -233,7 +233,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
        }
        info->map.virt = ioremap(dev->resource->start,
-                                 dev->resource->end - dev->resource->start + 1);
+                                 resource_size(dev->resource));
        if (!info->map.virt) {
                printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n");
                err = -EIO;
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 380648e9051a..d9603f7f9652 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -48,23 +48,22 @@ static int physmap_flash_remove(struct platform_device *dev)
        if (info->cmtd) {
 #ifdef CONFIG_MTD_PARTITIONS
-                if (info->nr_parts || physmap_data->nr_parts)
+                if (info->nr_parts || physmap_data->nr_parts) {
                        del_mtd_partitions(info->cmtd);
-                else
+                        if (info->nr_parts)
+                                kfree(info->parts);
+                } else {
                        del_mtd_device(info->cmtd);
+                }
 #else
                del_mtd_device(info->cmtd);
 #endif
-        }
-#ifdef CONFIG_MTD_PARTITIONS
-        if (info->nr_parts)
-                kfree(info->parts);
-#endif
 #ifdef CONFIG_MTD_CONCAT
-        if (info->cmtd != info->mtd[0])
+                if (info->cmtd != info->mtd[0])
-                mtd_concat_destroy(info->cmtd);
+                        mtd_concat_destroy(info->cmtd);
 #endif
+        }
        for (i = 0; i < MAX_RESOURCES; i++) {
                if (info->mtd[i] != NULL)
@@ -130,7 +129,7 @@ static int physmap_flash_probe(struct platform_device *dev)
                                                 info->map[i].size);
                if (info->map[i].virt == NULL) {
                        dev_err(&dev->dev, "Failed to ioremap flash region\n");
-                        err = EIO;
+                        err = -EIO;
                        goto err_out;
                }
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index d7a47574d21e..f3af87e08ecd 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -248,7 +248,7 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
                plat->exit();
 }
-static struct sa_info *__init
+static struct sa_info *__devinit
 sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
 {
        struct sa_info *info;
diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c
index 1f73297e7776..82afad0ddd72 100644
--- a/drivers/mtd/maps/vmu-flash.c
+++ b/drivers/mtd/maps/vmu-flash.c
@@ -612,16 +612,15 @@ static int __devinit vmu_connect(struct maple_device *mdev)
        test_flash_data = be32_to_cpu(mdev->devinfo.function);
        /* Need to count how many bits are set - to find out which
-         * function_data element has details of the memory card:
+         * function_data element has details of the memory card
-         * using Brian Kernighan's/Peter Wegner's method */
+         */
-        for (c = 0; test_flash_data; c++)
+        c = hweight_long(test_flash_data);
-                test_flash_data &= test_flash_data - 1;
        basic_flash_data = be32_to_cpu(mdev->devinfo.function_data[c - 1]);
        card = kmalloc(sizeof(struct memcard), GFP_KERNEL);
        if (!card) {
-                error = ENOMEM;
+                error = -ENOMEM;
                goto fail_nomem;
        }

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 847e214ade59..4c364d44ad59 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig
@@ -359,12 +359,6 @@ config MTD_SA1100
359	the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.	359	the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.
360	If you have such a board, say 'Y'.	360	If you have such a board, say 'Y'.
361		361
362	config MTD_IPAQ
363	tristate "CFI Flash device mapped on Compaq/HP iPAQ"
364	depends on IPAQ_HANDHELD && MTD_CFI
365	help
366	This provides a driver for the on-board flash of the iPAQ.
367
368	config MTD_DC21285	362	config MTD_DC21285
369	tristate "CFI Flash device mapped on DC21285 Footbridge"	363	tristate "CFI Flash device mapped on DC21285 Footbridge"
370	depends on MTD_CFI && ARCH_FOOTBRIDGE && MTD_COMPLEX_MAPPINGS	364	depends on MTD_CFI && ARCH_FOOTBRIDGE && MTD_COMPLEX_MAPPINGS


diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index ae2f6dbe43c3..ce315214ff2b 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile
@@ -24,12 +24,12 @@ obj-$(CONFIG_MTD_CEIVA) += ceiva.o
24	obj-$(CONFIG_MTD_OCTAGON) += octagon-5066.o	24	obj-$(CONFIG_MTD_OCTAGON) += octagon-5066.o
25	obj-$(CONFIG_MTD_PHYSMAP) += physmap.o	25	obj-$(CONFIG_MTD_PHYSMAP) += physmap.o
26	obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o	26	obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o
		27	obj-$(CONFIG_MTD_PISMO) += pismo.o
27	obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o	28	obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o
28	obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o	29	obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o
29	obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o	30	obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o
30	obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o	31	obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o
31	obj-$(CONFIG_MTD_SA1100) += sa1100-flash.o	32	obj-$(CONFIG_MTD_SA1100) += sa1100-flash.o
32	obj-$(CONFIG_MTD_IPAQ) += ipaq-flash.o
33	obj-$(CONFIG_MTD_SBC_GXX) += sbc_gxx.o	33	obj-$(CONFIG_MTD_SBC_GXX) += sbc_gxx.o
34	obj-$(CONFIG_MTD_SC520CDP) += sc520cdp.o	34	obj-$(CONFIG_MTD_SC520CDP) += sc520cdp.o
35	obj-$(CONFIG_MTD_NETSC520) += netsc520.o	35	obj-$(CONFIG_MTD_NETSC520) += netsc520.o


diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c deleted file mode 100644 index 76708e796b70..000000000000 --- a/drivers/mtd/maps/ipaq-flash.c +++ /dev/null
@@ -1,460 +0,0 @@
1	/*
2	* Flash memory access on iPAQ Handhelds (either SA1100 or PXA250 based)
3	*
4	* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
5	* (C) 2002 Hewlett-Packard Company <jamey.hicks@hp.com>
6	* (C) 2003 Christian Pellegrin <chri@ascensit.com>, <chri@infis.univ.ts.it>: concatenation of multiple flashes
7	*/
8
9	#include <linux/module.h>
10	#include <linux/types.h>
11	#include <linux/kernel.h>
12	#include <linux/spinlock.h>
13	#include <linux/init.h>
14	#include <linux/slab.h>
15	#include <asm/page.h>
16	#include <asm/mach-types.h>
17	#include <asm/system.h>
18	#include <asm/errno.h>
19
20	#include <linux/mtd/mtd.h>
21	#include <linux/mtd/map.h>
22	#include <linux/mtd/partitions.h>
23	#ifdef CONFIG_MTD_CONCAT
24	#include <linux/mtd/concat.h>
25	#endif
26
27	#include <mach/hardware.h>
28	#include <mach/h3600.h>
29	#include <asm/io.h>
30
31
32	#ifndef CONFIG_IPAQ_HANDHELD
33	#error This is for iPAQ Handhelds only
34	#endif
35	#ifdef CONFIG_SA1100_JORNADA56X
36
37	static void jornada56x_set_vpp(struct map_info *map, int vpp)
38	{
39	if (vpp)
40	GPSR = GPIO_GPIO26;
41	else
42	GPCR = GPIO_GPIO26;
43	GPDR \|= GPIO_GPIO26;
44	}
45
46	#endif
47
48	#ifdef CONFIG_SA1100_JORNADA720
49
50	static void jornada720_set_vpp(struct map_info *map, int vpp)
51	{
52	if (vpp)
53	PPSR \|= 0x80;
54	else
55	PPSR &= ~0x80;
56	PPDR \|= 0x80;
57	}
58
59	#endif
60
61	#define MAX_IPAQ_CS 2 /* Number of CS we are going to test */
62
63	#define IPAQ_MAP_INIT(X) \
64	{ \
65	name: "IPAQ flash " X, \
66	}
67
68
69	static struct map_info ipaq_map[MAX_IPAQ_CS] = {
70	IPAQ_MAP_INIT("bank 1"),
71	IPAQ_MAP_INIT("bank 2")
72	};
73
74	static struct mtd_info *my_sub_mtd[MAX_IPAQ_CS] = {
75	NULL,
76	NULL
77	};
78
79	/*
80	* Here are partition information for all known IPAQ-based devices.
81	* See include/linux/mtd/partitions.h for definition of the mtd_partition
82	* structure.
83	*
84	* The *_max_flash_size is the maximum possible mapped flash size which
85	* is not necessarily the actual flash size. It must be no more than
86	* the value specified in the "struct map_desc *_io_desc" mapping
87	* definition for the corresponding machine.
88	*
89	* Please keep these in alphabetical order, and formatted as per existing
90	* entries. Thanks.
91	*/
92
93	#ifdef CONFIG_IPAQ_HANDHELD
94	static unsigned long h3xxx_max_flash_size = 0x04000000;
95	static struct mtd_partition h3xxx_partitions[] = {
96	{
97	name: "H3XXX boot firmware",
98	#ifndef CONFIG_LAB
99	size: 0x00040000,
100	#else
101	size: 0x00080000,
102	#endif
103	offset: 0,
104	#ifndef CONFIG_LAB
105	mask_flags: MTD_WRITEABLE, /* force read-only */
106	#endif
107	},
108	{
109	name: "H3XXX root jffs2",
110	#ifndef CONFIG_LAB
111	size: 0x2000000 - 20x40000, / Warning, this is fixed later */
112	offset: 0x00040000,
113	#else
114	size: 0x2000000 - 0x40000 - 0x80000, /* Warning, this is fixed later */
115	offset: 0x00080000,
116	#endif
117	},
118	{
119	name: "asset",
120	size: 0x40000,
121	offset: 0x2000000 - 0x40000, /* Warning, this is fixed later */
122	mask_flags: MTD_WRITEABLE, /* force read-only */
123	}
124	};
125
126	#ifndef CONFIG_MTD_CONCAT
127	static struct mtd_partition h3xxx_partitions_bank2[] = {
128	/* this is used only on 2 CS machines when concat is not present */
129	{
130	name: "second H3XXX root jffs2",
131	size: 0x1000000 - 0x40000, /* Warning, this is fixed later */
132	offset: 0x00000000,
133	},
134	{
135	name: "second asset",
136	size: 0x40000,
137	offset: 0x1000000 - 0x40000, /* Warning, this is fixed later */
138	mask_flags: MTD_WRITEABLE, /* force read-only */
139	}
140	};
141	#endif
142
143	static DEFINE_SPINLOCK(ipaq_vpp_lock);
144
145	static void h3xxx_set_vpp(struct map_info *map, int vpp)
146	{
147	static int nest = 0;
148
149	spin_lock(&ipaq_vpp_lock);
150	if (vpp)
151	nest++;
152	else
153	nest--;
154	if (nest)
155	assign_h3600_egpio(IPAQ_EGPIO_VPP_ON, 1);
156	else
157	assign_h3600_egpio(IPAQ_EGPIO_VPP_ON, 0);
158	spin_unlock(&ipaq_vpp_lock);
159	}
160
161	#endif
162
163	#if defined(CONFIG_SA1100_JORNADA56X) \|\| defined(CONFIG_SA1100_JORNADA720)
164	static unsigned long jornada_max_flash_size = 0x02000000;
165	static struct mtd_partition jornada_partitions[] = {
166	{
167	name: "Jornada boot firmware",
168	size: 0x00040000,
169	offset: 0,
170	mask_flags: MTD_WRITEABLE, /* force read-only */
171	}, {
172	name: "Jornada root jffs2",
173	size: MTDPART_SIZ_FULL,
174	offset: 0x00040000,
175	}
176	};
177	#endif
178
179
180	static struct mtd_partition *parsed_parts;
181	static struct mtd_info *mymtd;
182
183	static unsigned long cs_phys[] = {
184	#ifdef CONFIG_ARCH_SA1100
185	SA1100_CS0_PHYS,
186	SA1100_CS1_PHYS,
187	SA1100_CS2_PHYS,
188	SA1100_CS3_PHYS,
189	SA1100_CS4_PHYS,
190	SA1100_CS5_PHYS,
191	#else
192	PXA_CS0_PHYS,
193	PXA_CS1_PHYS,
194	PXA_CS2_PHYS,
195	PXA_CS3_PHYS,
196	PXA_CS4_PHYS,
197	PXA_CS5_PHYS,
198	#endif
199	};
200
201	static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
202
203	static int __init h1900_special_case(void);
204
205	static int __init ipaq_mtd_init(void)
206	{
207	struct mtd_partition *parts = NULL;
208	int nb_parts = 0;
209	int parsed_nr_parts = 0;
210	const char *part_type;
211	int i; /* used when we have >1 flash chips */
212	unsigned long tot_flashsize = 0; /* used when we have >1 flash chips */
213
214	/* Default flash bankwidth */
215	// ipaq_map.bankwidth = (MSC0 & MSC_RBW) ? 2 : 4;
216
217	if (machine_is_h1900())
218	{
219	/* For our intents, the h1900 is not a real iPAQ, so we special-case it. */
220	return h1900_special_case();
221	}
222
223	if (machine_is_h3100() \|\| machine_is_h1900())
224	for(i=0; i<MAX_IPAQ_CS; i++)
225	ipaq_map[i].bankwidth = 2;
226	else
227	for(i=0; i<MAX_IPAQ_CS; i++)
228	ipaq_map[i].bankwidth = 4;
229
230	/*
231	* Static partition definition selection
232	*/
233	part_type = "static";
234
235	simple_map_init(&ipaq_map[0]);
236	simple_map_init(&ipaq_map[1]);
237
238	#ifdef CONFIG_IPAQ_HANDHELD
239	if (machine_is_ipaq()) {
240	parts = h3xxx_partitions;
241	nb_parts = ARRAY_SIZE(h3xxx_partitions);
242	for(i=0; i<MAX_IPAQ_CS; i++) {
243	ipaq_map[i].size = h3xxx_max_flash_size;
244	ipaq_map[i].set_vpp = h3xxx_set_vpp;
245	ipaq_map[i].phys = cs_phys[i];
246	ipaq_map[i].virt = ioremap(cs_phys[i], 0x04000000);
247	if (machine_is_h3100 () \|\| machine_is_h1900())
248	ipaq_map[i].bankwidth = 2;
249	}
250	if (machine_is_h3600()) {
251	/* No asset partition here */
252	h3xxx_partitions[1].size += 0x40000;
253	nb_parts--;
254	}
255	}
256	#endif
257	#ifdef CONFIG_ARCH_H5400
258	if (machine_is_h5400()) {
259	ipaq_map[0].size = 0x02000000;
260	ipaq_map[1].size = 0x02000000;
261	ipaq_map[1].phys = 0x02000000;
262	ipaq_map[1].virt = ipaq_map[0].virt + 0x02000000;
263	}
264	#endif
265	#ifdef CONFIG_ARCH_H1900
266	if (machine_is_h1900()) {
267	ipaq_map[0].size = 0x00400000;
268	ipaq_map[1].size = 0x02000000;
269	ipaq_map[1].phys = 0x00080000;
270	ipaq_map[1].virt = ipaq_map[0].virt + 0x00080000;
271	}
272	#endif
273
274	#ifdef CONFIG_SA1100_JORNADA56X
275	if (machine_is_jornada56x()) {
276	parts = jornada_partitions;
277	nb_parts = ARRAY_SIZE(jornada_partitions);
278	ipaq_map[0].size = jornada_max_flash_size;
279	ipaq_map[0].set_vpp = jornada56x_set_vpp;
280	ipaq_map[0].virt = (__u32)ioremap(0x0, 0x04000000);
281	}
282	#endif
283	#ifdef CONFIG_SA1100_JORNADA720
284	if (machine_is_jornada720()) {
285	parts = jornada_partitions;
286	nb_parts = ARRAY_SIZE(jornada_partitions);
287	ipaq_map[0].size = jornada_max_flash_size;
288	ipaq_map[0].set_vpp = jornada720_set_vpp;
289	}
290	#endif
291
292
293	if (machine_is_ipaq()) { /* for iPAQs only */
294	for(i=0; i<MAX_IPAQ_CS; i++) {
295	printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with CFI.\n", ipaq_map[i].bankwidth*8, ipaq_map[i].virt);
296	my_sub_mtd[i] = do_map_probe("cfi_probe", &ipaq_map[i]);
297	if (!my_sub_mtd[i]) {
298	printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[i].bankwidth*8, ipaq_map[i].virt);
299	my_sub_mtd[i] = do_map_probe("jedec_probe", &ipaq_map[i]);
300	}
301	if (!my_sub_mtd[i]) {
302	printk(KERN_NOTICE "iPAQ flash: failed to find flash.\n");
303	if (i)
304	break;
305	else
306	return -ENXIO;
307	} else
308	printk(KERN_NOTICE "iPAQ flash: found %d bytes\n", my_sub_mtd[i]->size);
309
310	/* do we really need this debugging? --joshua 20030703 */
311	// printk("my_sub_mtd[%d]=%p\n", i, my_sub_mtd[i]);
312	my_sub_mtd[i]->owner = THIS_MODULE;
313	tot_flashsize += my_sub_mtd[i]->size;
314	}
315	#ifdef CONFIG_MTD_CONCAT
316	/* fix the asset location */
317	# ifdef CONFIG_LAB
318	h3xxx_partitions[1].size = tot_flashsize - 0x40000 - 0x80000 /* extra big boot block */;
319	# else
320	h3xxx_partitions[1].size = tot_flashsize - 2 * 0x40000;
321	# endif
322	h3xxx_partitions[2].offset = tot_flashsize - 0x40000;
323	/* and concat the devices */
324	mymtd = mtd_concat_create(&my_sub_mtd[0], i,
325	"ipaq");
326	if (!mymtd) {
327	printk("Cannot create iPAQ concat device\n");
328	return -ENXIO;
329	}
330	#else
331	mymtd = my_sub_mtd[0];
332
333	/*
334	*In the very near future, command line partition parsing
335	* will use the device name as 'mtd-id' instead of a value
336	* passed to the parse_cmdline_partitions() routine. Since
337	* the bootldr says 'ipaq', make sure it continues to work.
338	*/
339	mymtd->name = "ipaq";
340
341	if ((machine_is_h3600())) {
342	# ifdef CONFIG_LAB
343	h3xxx_partitions[1].size = my_sub_mtd[0]->size - 0x80000;
344	# else
345	h3xxx_partitions[1].size = my_sub_mtd[0]->size - 0x40000;
346	# endif
347	nb_parts = 2;
348	} else {
349	# ifdef CONFIG_LAB
350	h3xxx_partitions[1].size = my_sub_mtd[0]->size - 0x40000 - 0x80000; /* extra big boot block */
351	# else
352	h3xxx_partitions[1].size = my_sub_mtd[0]->size - 2*0x40000;
353	# endif
354	h3xxx_partitions[2].offset = my_sub_mtd[0]->size - 0x40000;
355	}
356
357	if (my_sub_mtd[1]) {
358	# ifdef CONFIG_LAB
359	h3xxx_partitions_bank2[0].size = my_sub_mtd[1]->size - 0x80000;
360	# else
361	h3xxx_partitions_bank2[0].size = my_sub_mtd[1]->size - 0x40000;
362	# endif
363	h3xxx_partitions_bank2[1].offset = my_sub_mtd[1]->size - 0x40000;
364	}
365	#endif
366	}
367	else {
368	/*
369	* Now let's probe for the actual flash. Do it here since
370	* specific machine settings might have been set above.
371	*/
372	printk(KERN_NOTICE "IPAQ flash: probing %d-bit flash bus, window=%lx\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);
373	mymtd = do_map_probe("cfi_probe", &ipaq_map[0]);
374	if (!mymtd)
375	return -ENXIO;
376	mymtd->owner = THIS_MODULE;
377	}
378
379
380	/*
381	* Dynamic partition selection stuff (might override the static ones)
382	*/
383
384	i = parse_mtd_partitions(mymtd, part_probes, &parsed_parts, 0);
385
386	if (i > 0) {
387	nb_parts = parsed_nr_parts = i;
388	parts = parsed_parts;
389	part_type = "dynamic";
390	}
391
392	if (!parts) {
393	printk(KERN_NOTICE "IPAQ flash: no partition info available, registering whole flash at once\n");
394	add_mtd_device(mymtd);
395	#ifndef CONFIG_MTD_CONCAT
396	if (my_sub_mtd[1])
397	add_mtd_device(my_sub_mtd[1]);
398	#endif
399	} else {
400	printk(KERN_NOTICE "Using %s partition definition\n", part_type);
401	add_mtd_partitions(mymtd, parts, nb_parts);
402	#ifndef CONFIG_MTD_CONCAT
403	if (my_sub_mtd[1])
404	add_mtd_partitions(my_sub_mtd[1], h3xxx_partitions_bank2, ARRAY_SIZE(h3xxx_partitions_bank2));
405	#endif
406	}
407
408	return 0;
409	}
410
411	static void __exit ipaq_mtd_cleanup(void)
412	{
413	int i;
414
415	if (mymtd) {
416	del_mtd_partitions(mymtd);
417	#ifndef CONFIG_MTD_CONCAT
418	if (my_sub_mtd[1])
419	del_mtd_partitions(my_sub_mtd[1]);
420	#endif
421	map_destroy(mymtd);
422	#ifdef CONFIG_MTD_CONCAT
423	for(i=0; i<MAX_IPAQ_CS; i++)
424	#else
425	for(i=1; i<MAX_IPAQ_CS; i++)
426	#endif
427	{
428	if (my_sub_mtd[i])
429	map_destroy(my_sub_mtd[i]);
430	}
431	kfree(parsed_parts);
432	}
433	}
434
435	static int __init h1900_special_case(void)
436	{
437	/* The iPAQ h1900 is a special case - it has weird ROM. */
438	simple_map_init(&ipaq_map[0]);
439	ipaq_map[0].size = 0x80000;
440	ipaq_map[0].set_vpp = h3xxx_set_vpp;
441	ipaq_map[0].phys = 0x0;
442	ipaq_map[0].virt = ioremap(0x0, 0x04000000);
443	ipaq_map[0].bankwidth = 2;
444
445	printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);
446	mymtd = do_map_probe("jedec_probe", &ipaq_map[0]);
447	if (!mymtd)
448	return -ENODEV;
449	add_mtd_device(mymtd);
450	printk(KERN_NOTICE "iPAQ flash: registered h1910 flash\n");
451
452	return 0;
453	}
454
455	module_init(ipaq_mtd_init);
456	module_exit(ipaq_mtd_cleanup);
457
458	MODULE_AUTHOR("Jamey Hicks");
459	MODULE_DESCRIPTION("IPAQ CFI map driver");
460	MODULE_LICENSE("MIT");


diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c index 7214b876feba..7b0515297411 100644 --- a/drivers/mtd/maps/ixp4xx.c +++ b/drivers/mtd/maps/ixp4xx.c
@@ -210,7 +210,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
210	* not attempt to do a direct access on us.	210	* not attempt to do a direct access on us.
211	*/	211	*/
212	info->map.phys = NO_XIP;	212	info->map.phys = NO_XIP;
213	info->map.size = dev->resource->end - dev->resource->start + 1;	213	info->map.size = resource_size(dev->resource);
214		214
215	/*	215	/*
216	* We only support 16-bit accesses for now. If and when	216	* We only support 16-bit accesses for now. If and when
@@ -224,7 +224,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
224	info->map.copy_from = ixp4xx_copy_from,	224	info->map.copy_from = ixp4xx_copy_from,
225		225
226	info->res = request_mem_region(dev->resource->start,	226	info->res = request_mem_region(dev->resource->start,
227	dev->resource->end - dev->resource->start + 1,	227	resource_size(dev->resource),
228	"IXP4XXFlash");	228	"IXP4XXFlash");
229	if (!info->res) {	229	if (!info->res) {
230	printk(KERN_ERR "IXP4XXFlash: Could not reserve memory region\n");	230	printk(KERN_ERR "IXP4XXFlash: Could not reserve memory region\n");
@@ -233,7 +233,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
233	}	233	}
234		234
235	info->map.virt = ioremap(dev->resource->start,	235	info->map.virt = ioremap(dev->resource->start,
236	dev->resource->end - dev->resource->start + 1);	236	resource_size(dev->resource));
237	if (!info->map.virt) {	237	if (!info->map.virt) {
238	printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n");	238	printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n");
239	err = -EIO;	239	err = -EIO;


diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 380648e9051a..d9603f7f9652 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c
@@ -48,23 +48,22 @@ static int physmap_flash_remove(struct platform_device *dev)
48		48
49	if (info->cmtd) {	49	if (info->cmtd) {
50	#ifdef CONFIG_MTD_PARTITIONS	50	#ifdef CONFIG_MTD_PARTITIONS
51	if (info->nr_parts \|\| physmap_data->nr_parts)	51	if (info->nr_parts \|\| physmap_data->nr_parts) {
52	del_mtd_partitions(info->cmtd);	52	del_mtd_partitions(info->cmtd);
53	else	53
		54	if (info->nr_parts)
		55	kfree(info->parts);
		56	} else {
54	del_mtd_device(info->cmtd);	57	del_mtd_device(info->cmtd);
		58	}
55	#else	59	#else
56	del_mtd_device(info->cmtd);	60	del_mtd_device(info->cmtd);
57	#endif	61	#endif
58	}
59	#ifdef CONFIG_MTD_PARTITIONS
60	if (info->nr_parts)
61	kfree(info->parts);
62	#endif
63
64	#ifdef CONFIG_MTD_CONCAT	62	#ifdef CONFIG_MTD_CONCAT
65	if (info->cmtd != info->mtd[0])	63	if (info->cmtd != info->mtd[0])
66	mtd_concat_destroy(info->cmtd);	64	mtd_concat_destroy(info->cmtd);
67	#endif	65	#endif
		66	}
68		67
69	for (i = 0; i < MAX_RESOURCES; i++) {	68	for (i = 0; i < MAX_RESOURCES; i++) {
70	if (info->mtd[i] != NULL)	69	if (info->mtd[i] != NULL)
@@ -130,7 +129,7 @@ static int physmap_flash_probe(struct platform_device *dev)
130	info->map[i].size);	129	info->map[i].size);
131	if (info->map[i].virt == NULL) {	130	if (info->map[i].virt == NULL) {
132	dev_err(&dev->dev, "Failed to ioremap flash region\n");	131	dev_err(&dev->dev, "Failed to ioremap flash region\n");
133	err = EIO;	132	err = -EIO;
134	goto err_out;	133	goto err_out;
135	}	134	}
136		135


diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index d7a47574d21e..f3af87e08ecd 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c
@@ -248,7 +248,7 @@ static void sa1100_destroy(struct sa_info info, struct flash_platform_data pla
248	plat->exit();	248	plat->exit();
249	}	249	}
250		250
251	static struct sa_info *__init	251	static struct sa_info *__devinit
252	sa1100_setup_mtd(struct platform_device pdev, struct flash_platform_data plat)	252	sa1100_setup_mtd(struct platform_device pdev, struct flash_platform_data plat)
253	{	253	{
254	struct sa_info *info;	254	struct sa_info *info;


diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c index 1f73297e7776..82afad0ddd72 100644 --- a/drivers/mtd/maps/vmu-flash.c +++ b/drivers/mtd/maps/vmu-flash.c
@@ -612,16 +612,15 @@ static int __devinit vmu_connect(struct maple_device *mdev)
612		612
613	test_flash_data = be32_to_cpu(mdev->devinfo.function);	613	test_flash_data = be32_to_cpu(mdev->devinfo.function);
614	/* Need to count how many bits are set - to find out which	614	/* Need to count how many bits are set - to find out which
615	* function_data element has details of the memory card:	615	* function_data element has details of the memory card
616	* using Brian Kernighan's/Peter Wegner's method */	616	*/
617	for (c = 0; test_flash_data; c++)	617	c = hweight_long(test_flash_data);
618	test_flash_data &= test_flash_data - 1;
619		618
620	basic_flash_data = be32_to_cpu(mdev->devinfo.function_data[c - 1]);	619	basic_flash_data = be32_to_cpu(mdev->devinfo.function_data[c - 1]);
621		620
622	card = kmalloc(sizeof(struct memcard), GFP_KERNEL);	621	card = kmalloc(sizeof(struct memcard), GFP_KERNEL);
623	if (!card) {	622	if (!card) {
624	error = ENOMEM;	623	error = -ENOMEM;
625	goto fail_nomem;	624	goto fail_nomem;
626	}	625	}
627		626