Merge tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd

Pull MTD update from Brian Norris:
 "Sorry for delaying this a bit later than usual.  There's one mild
  regression from 3.16 that was noticed during the 3.17 cycle, and I
  meant to send a fix for it along with this pull request.  I'll
  probably try to queue it up for a later pull request once I've had a
  better look at it, hopefully by -rc2 at the latest.

  Summary for this pull:

  NAND
   - Cleanup for Denali driver
   - Atmel: add support for new page sizes
   - Atmel: fix up 'raw' mode support
   - Atmel: miscellaneous cleanups
   - New timing mode helpers for non-ONFI NAND
   - OMAP: allow driver to be (properly) built as a module
   - bcm47xx: RESET support and other cleanups

  SPI NOR
   - Miscellaneous cleanups, to prepare framework for wider use (some
     further work still pending)
   - Compile-time configuration to select 4K vs.  64K support for flash
     that support both (necessary for using UBIFS on some SPI NOR)

  A few scattered code quality fixes, detected by Coverity

  See the changesets for more"

* tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd: (59 commits)
  mtd: nand: omap: Correct CONFIG_MTD_NAND_OMAP_BCH help message
  mtd: nand: Force omap_elm to be built as a module if omap2_nand is a module
  mtd: move support for struct flash_platform_data into m25p80
  mtd: spi-nor: add Kconfig option to disable 4K sectors
  mtd: nand: Move ELM driver and rename as omap_elm
  nand: omap2: Replace pr_err with dev_err
  nand: omap2: Remove horrible ifdefs to fix module probe
  mtd: nand: add Hynix's H27UCG8T2ATR-BC to nand_ids table
  mtd: nand: support ONFI timing mode retrieval for non-ONFI NANDs
  mtd: physmap_of: Add non-obsolete map_rom probe
  mtd: physmap_of: Fix ROM support via OF
  MAINTAINERS: add l2-mtd.git, 'next' tree for MTD
  mtd: denali: fix indents and other trivial things
  mtd: denali: remove unnecessary parentheses
  mtd: denali: remove another set-but-unused variable
  mtd: denali: fix include guard and license block of denali.h
  mtd: nand: don't break long print messages
  mtd: bcm47xxnflash: replace some magic numbers
  mtd: bcm47xxnflash: NAND_CMD_RESET support
  mtd: bcm47xxnflash: add cmd_ctrl handler
  ...

4 files changed, 35 insertions, 17 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 21b2874a303b..ba801d2c6dcc 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -249,7 +249,7 @@ config MTD_CFI_FLAGADM
 
 config MTD_SOLUTIONENGINE
         tristate "CFI Flash device mapped on Hitachi SolutionEngine"
-        depends on SUPERH && SOLUTION_ENGINE && MTD_CFI && MTD_REDBOOT_PARTS
+        depends on SOLUTION_ENGINE && MTD_CFI && MTD_REDBOOT_PARTS
         help
           This enables access to the flash chips on the Hitachi SolutionEngine and
           similar boards. Say 'Y' if you are building a kernel for such a board.
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index a4c477b9fdd6..2fb346091af2 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -99,22 +99,28 @@ static map_word gf_read(struct map_info *map, unsigned long ofs)
  *      @from: flash offset to copy from
  *      @len:  how much to copy
  *
- * We rely on the MTD layer to chunk up copies such that a single request here
- * will not cross a window size.  This allows us to only wiggle the GPIOs once
- * before falling back to a normal memcpy.  Reading the higher layer code shows
- * that this is indeed the case, but add a BUG_ON() to future proof.
+ * The "from" region may straddle more than one window, so toggle the GPIOs for
+ * each window region before reading its data.
  */
 static void gf_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
 {
         struct async_state *state = gf_map_info_to_state(map);
 
-        gf_set_gpios(state, from);
+        int this_len;
 
-        /* BUG if operation crosses the win_size */
-        BUG_ON(!((from + len) % state->win_size <= (from + len)));
+        while (len) {
+                if ((from % state->win_size) + len > state->win_size)
+                        this_len = state->win_size - (from % state->win_size);
+                else
+                        this_len = len;
 
-        /* operation does not cross the win_size, so one shot it */
-        memcpy_fromio(to, map->virt + (from % state->win_size), len);
+                gf_set_gpios(state, from);
+                memcpy_fromio(to, map->virt + (from % state->win_size),
+                         this_len);
+                len -= this_len;
+                from += this_len;
+                to += this_len;
+        }
 }
 
 /**
@@ -147,13 +153,21 @@ static void gf_copy_to(struct map_info *map, unsigned long to,
 {
         struct async_state *state = gf_map_info_to_state(map);
 
-        gf_set_gpios(state, to);
+        int this_len;
+
+        while (len) {
+                if ((to % state->win_size) + len > state->win_size)
+                        this_len = state->win_size - (to % state->win_size);
+                else
+                        this_len = len;
 
-        /* BUG if operation crosses the win_size */
-        BUG_ON(!((to + len) % state->win_size <= (to + len)));
+                gf_set_gpios(state, to);
+                memcpy_toio(map->virt + (to % state->win_size), from, len);
 
-        /* operation does not cross the win_size, so one shot it */
-        memcpy_toio(map->virt + (to % state->win_size), from, len);
+                len -= this_len;
+                to += this_len;
+                from += this_len;
+        }
 }
 
 static const char * const part_probe_types[] = {
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index a3cfad392ed6..af747af5eee9 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -89,7 +89,7 @@ static caddr_t remap_window(struct map_info *map, unsigned long to)
 
         if (!pcmcia_dev_present(dev->p_dev)) {
                 pr_debug("device removed\n");
-                return 0;
+                return NULL;
         }
 
         offset = to & ~(dev->win_size-1);
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 217c25d7381b..c1d21cb501ca 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -103,7 +103,7 @@ static struct mtd_info *obsolete_probe(struct platform_device *dev,
                 if (strcmp(of_probe, "ROM") != 0)
                         dev_warn(&dev->dev, "obsolete_probe: don't know probe "
                                  "type '%s', mapping as rom\n", of_probe);
-                return do_map_probe("mtd_rom", map);
+                return do_map_probe("map_rom", map);
         }
 }
 
@@ -340,6 +340,10 @@ static struct of_device_id of_flash_match[] = {
                 .data           = (void *)"map_ram",
         },
         {
+                .compatible     = "mtd-rom",
+                .data           = (void *)"map_rom",
+        },
+        {
                 .type           = "rom",
                 .compatible     = "direct-mapped"
         },