Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-linus-20151106' of git://git.infradead.org/linux-mtd · 02f0d3f7
    Linus Torvalds authored
    Pull MTD updates from Brian Norris:
     "Core:
    
       - WARN (in some cases) when a struct mtd_info is registered multiple
         times; in the past this was "supported", but it's still error prone
         for future development.  There's only one ugly case of this left in
         the tree (that we're aware of) and the owners are aware of the
         problems there.
    
       - fix potential deadlock in the blkdev removal path NOTE: the
         (potential) deadlock was introduced in a for-stable patch.  This
         one is also marked for -stable.
    
       - ioctl(BLKPG) compat_ioctl support; resolves issues with 32-bit user
         space vs 64-bit kernel space
    
       - Set MTD parent device correctly throughout the tree, so the tree
         structure appears correctly in sysfs; many drivers were missing
         this (soft) requirement
    
       - Move device tree partitions (ofpart) into a dedicated 'partitions'
         subnode; this helps to disambiguate whether a node is a partition
         or some other auxiliary data
    
       - Improve error handling for partitioning failures
    
      NAND:
    
       - General: Increase timeout period, for corner-case systems with
         less-than-accurate jiffies
    
       - Fix OF-based autoloading of several NAND drivers when built as
         modules
    
       - pxa3xx_nand:
          - Rework timing configuration to be more dynamic
          - Refactor PM support
    
       - brcmnand: prepare for NorthStar 2 support (ARM64, 16-bit NAND
         chips)
    
       - sunxi_nand: refactoring and a few bug fixes
    
       - vf610: new NAND driver
    
       - FSMC: add SW BCH support; support common NAND DT bindings
    
       - lpc32xx_slc: refactor and improve timing calculations logic
    
       - denali: support for rev 5.1
    
      SPI NOR:
    
       - Layering improvements
    
       - Added Winbond lock/unlock support
    
       - Added mtd_is_locked() (i.e., ioctl(MEMISLOCKED)) support
    
       - Increase full-chip-erase timeout linearly with flash size
    
       - fsl-quadspi: fix compile for non-ARM architectures
    
       - New flash support"
    
    * tag 'for-linus-20151106' of git://git.infradead.org/linux-mtd: (169 commits)
      mtd: don't WARN about overloaded users of mtd->reboot_notifier.notifier_call
      mtd: nand: sunxi: avoid retrieving data before ECC pass
      mtd: nand: sunxi: fix sunxi_nfc_hw_ecc_read/write_chunk()
      mtd: blkdevs: fix potential deadlock + lockdep warnings
      mtd: ofpart: move ofpart partitions to a dedicated dt node
      doc: dt: mtd: support partitions in a special 'partitions' subnode
      mtd: brcmnand: Force 8bit mode before doing nand_scan_ident()
      mtd: brcmnand: factor out CFG and CFG_EXT bitfields
      mtd: mtdpart: Do not fail mtd probe when parsing partitions fails
      mtd: fsl-quadspi: fix macro collision problems with READ/WRITE
      mtd: warn when registering the same master many times
      mtd: fixup corner case error handling in mtd_device_parse_register()
      mtd: tests: Replace timeval with ktime_t
      mtd: fsmc_nand: Add BCH4 SW ECC support for SPEAr600
      mtd: nand: vf610_nfc: use nand_check_erased_ecc_chunk() helper
      mtd: nand: increase ready wait timeout and report timeouts
      mtd: docg3: off by one in doc_register_sysfs()
      mtd: pxa3xx_nand: clean up the pxa3xx timings
      mtd: pxa3xx_nand: rework flash detection and timing setup
      mtd: pxa3xx_nand: add helpers to setup the timings
      ...
    02f0d3f7