• L
    Merge tag 'for-linus-20131112' of git://git.infradead.org/linux-mtd · 82cb6ace
    Linus Torvalds 提交于
    Pull MTD changes from Brian Norris:
     - Unify some compile-time differences so that we have fewer uses of
       #ifdef CONFIG_OF in atmel_nand
     - Other general cleanups (removing unused functions, options,
       variables, fields; use correct interfaces)
     - Fix BUG() for new odd-sized NAND, which report non-power-of-2
       dimensions via ONFI
     - Miscellaneous driver fixes (SPI NOR flash; BCM47xx NAND flash; etc.)
     - Improve differentiation between SLC and MLC NAND -- this clarifies an
       ABI issue regarding the MTD "type" (in sysfs and in the MEMGETINFO
       ioctl), where the MTD_MLCNANDFLASH type was present but
       inconsistently used
     - Extend GPMI NAND to support multi-chip-select NAND for some platforms
     - Many improvements to the OMAP2/3 NAND driver, including an expanded
       DT binding to bring us closer to mainline support for some OMAP
       systems
     - Fix a deadlock in the error path of the Atmel NAND driver probe
     - Correct the error codes from MTD mmap() to conform to POSIX and the
       Linux Programmer's Manual.  This is an acknowledged change in the MTD
       ABI, but I can't imagine somebody relying on the non-standard -ENOSYS
       error code specifically.  Am I just being unimaginative? :)
     - Fix a few important GPMI NAND bugs (one regression from 3.12 and one
       long-standing race condition)
     - More? Read the log!
    
    * tag 'for-linus-20131112' of git://git.infradead.org/linux-mtd: (98 commits)
      mtd: gpmi: fix the NULL pointer
      mtd: gpmi: fix kernel BUG due to racing DMA operations
      mtd: mtdchar: return expected errors on mmap() call
      mtd: gpmi: only scan two chips for imx6
      mtd: gpmi: Use devm_kzalloc()
      mtd: atmel_nand: fix bug driver will in a dead lock if no nand detected
      mtd: nand: use a local variable to simplify the nand_scan_tail
      mtd: nand: remove deprecated IRQF_DISABLED
      mtd: dataflash: Say if we find a device we don't support
      mtd: nand: omap: fix error return code in omap_nand_probe()
      mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES
      mtd: m25p80: fixup device removal failure path
      mtd: mxc_nand: Include linux/of.h header
      mtd: remove duplicated include from mtdcore.c
      mtd: m25p80: add support for Macronix mx25l3255e
      mtd: nand: omap: remove selection of BCH ecc-scheme via KConfig
      mtd: nand: omap: updated devm_xx for all resource allocation and free calls
      mtd: nand: omap: use drivers/mtd/nand/nand_bch.c wrapper for BCH ECC instead of lib/bch.c
      mtd: nand: omap: clean-up ecc layout for BCH ecc schemes
      mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe
      ...
    82cb6ace
atmel_nand.c 58.0 KB