Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-linus-20160801' of git://git.infradead.org/linux-mtd · affe8a2a
    Linus Torvalds authored
    Pull MTD updates from Brian Norris:
     "NAND:
    
        Quoting Boris:
         'This pull request contains only one notable change:
           - Addition of the MTK NAND controller driver
    
          And a bunch of specific NAND driver improvements/fixes. Here are the
          changes that are worth mentioning:
           - A few fixes/improvements for the xway NAND controller driver
           - A few fixes for the sunxi NAND controller driver
           - Support for DMA in the sunxi NAND driver
           - Support for the sunxi NAND controller IP embedded in A23/A33 SoCs
           - Addition for bitflips detection in erased pages to the brcmnand driver
           - Support for new brcmnand IPs
           - Update of the OMAP-GPMC binding to support DMA channel description'
    
        In addition, some small fixes around error handling, etc., as well
        as one long-standing corner case issue (2.6.20, I think?) with
        writing 1 byte less than a page.
    
      NOR:
    
       - rework some error handling on reads and writes, so we can better
         handle (for instance) SPI controllers which have limitations on
         their maximum transfer size
    
       - add new Cadence Quad SPI flash controller driver
    
       - add new Atmel QSPI flash controller driver
    
       - add new Hisilicon SPI flash controller driver
    
       - support a few new flash, and update supported features on others
    
       - fix the logic used for detecting a fully-unlocked flash
    
      And other miscellaneous small fixes"
    
    * tag 'for-linus-20160801' of git://git.infradead.org/linux-mtd: (60 commits)
      mtd: spi-nor: don't build Cadence QuadSPI on non-ARM
      mtd: mtk-nor: remove duplicated include from mtk-quadspi.c
      mtd: nand: fix bug writing 1 byte less than page size
      mtd: update description of MTD_BCM47XXSFLASH symbol
      mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller
      mtd: spi-nor: Bindings for Cadence Quad SPI Flash Controller driver
      mtd: nand: brcmnand: Change BUG_ON in brcmnand_send_cmd
      mtd: pmcmsp-flash: Allocating too much in init_msp_flash()
      mtd: maps: sa1100-flash: potential NULL dereference
      mtd: atmel-quadspi: add driver for Atmel QSPI controller
      mtd: nand: omap2: fix return value check in omap_nand_probe()
      Documentation: atmel-quadspi: add binding file for Atmel QSPI driver
      mtd: spi-nor: add hisilicon spi-nor flash controller driver
      mtd: spi-nor: support dual, quad, and WP for Gigadevice
      mtd: spi-nor: Added support for n25q00a.
      memory: Update dependency of IFC for Layerscape
      mtd: nand: jz4780: Update MODULE_AUTHOR email address
      mtd: nand: sunxi: prevent a small memory leak
      mtd: nand: sunxi: add reset line support
      mtd: nand: sunxi: update DT bindings
      ...
    affe8a2a