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

* git://git.infradead.org/mtd-2.6: (58 commits)
  mtd: jedec_probe: add PSD4256G6V id
  mtd: OneNand support for Nomadik 8815 SoC (on NHK8815 board)
  mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board)
  m25p80: Add Spansion S25FL129P serial flashes
  jffs2: Use SLAB_HWCACHE_ALIGN for jffs2_raw_{dirent,inode} slabs
  mtd: sh_flctl: register sh_flctl using platform_driver_probe()
  mtd: nand: txx9ndfmc: transfer 512 byte at a time if possible
  mtd: nand: fix tmio_nand ecc correction
  mtd: nand: add __nand_correct_data helper function
  mtd: cfi_cmdset_0002: add 0xFF intolerance for M29W128G
  mtd: inftl: fix fold chain block number
  mtd: jedec: fix compilation problem with I28F640C3B definition
  mtd: nand: fix ECC Correction bug for SMC ordering for NDFC driver
  mtd: ofpart: Check availability of reg property instead of name property
  driver/Makefile: Initialize "mtd" and "spi" before "net"
  mtd: omap: adding DMA mode support in nand prefetch/post-write
  mtd: omap: add support for nand prefetch-read and post-write
  mtd: add nand support for w90p910 (v2)
  mtd: maps: add mtd-ram support to physmap_of
  mtd: pxa3xx_nand: add single-bit error corrections reporting
  ...

1 files changed, 15 insertions, 9 deletions

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 39d357b2eb47..61e4eb48bb2d 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -190,6 +190,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
         const u32 *p;
         int reg_tuple_size;
         struct mtd_info **mtd_list = NULL;
+        resource_size_t res_size;
 
         reg_tuple_size = (of_n_addr_cells(dp) + of_n_size_cells(dp)) * sizeof(u32);
 
@@ -204,7 +205,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
                 dev_err(&dev->dev, "Malformed reg property on %s\n",
                                 dev->node->full_name);
                 err = -EINVAL;
-                goto err_out;
+                goto err_flash_remove;
         }
         count /= reg_tuple_size;
 
@@ -212,14 +213,14 @@ static int __devinit of_flash_probe(struct of_device *dev,
         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;
+                goto err_flash_remove;
 
         dev_set_drvdata(&dev->dev, info);
 
+        mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
+        if (!mtd_list)
+                goto err_flash_remove;
+
         for (i = 0; i < count; i++) {
                 err = -ENXIO;
                 if (of_address_to_resource(dp, i, &res)) {
@@ -233,8 +234,8 @@ static int __devinit of_flash_probe(struct of_device *dev,
                         (unsigned long long)res.end);
 
                 err = -EBUSY;
-                info->list[i].res = request_mem_region(res.start, res.end -
-                                                       res.start + 1,
+                res_size = resource_size(&res);
+                info->list[i].res = request_mem_region(res.start, res_size,
                                                        dev_name(&dev->dev));
                 if (!info->list[i].res)
                         goto err_out;
@@ -249,7 +250,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 
                 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.size = res_size;
                 info->list[i].map.bankwidth = *width;
 
                 err = -ENOMEM;
@@ -338,6 +339,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 
 err_out:
         kfree(mtd_list);
+err_flash_remove:
         of_flash_remove(dev);
 
         return err;
@@ -360,6 +362,10 @@ static struct of_device_id of_flash_match[] = {
                 .data           = (void *)"jedec_probe",
         },
         {
+                .compatible     = "mtd-ram",
+                .data           = (void *)"map_ram",
+        },
+        {
                 .type           = "rom",
                 .compatible     = "direct-mapped"
         },