• Linus Torvalds's avatar
    Merge tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd · 511c41d9
    Linus Torvalds authored
    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
      ...
    511c41d9
gpmc.c 49.3 KB