Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-linus-20170713' of git://git.infradead.org/linux-mtd · b5e16170
    Linus Torvalds authored
    Pull MTD updates from Brian Norris:
     "General updates:
       - Cleanups and additional flash support for "dataflash" driver
       - new driver for mchp23k256 SPI SRAM device
       - improve handling of MTDs without eraseblocks (i.e., MTD_NO_ERASE)
       - refactor and improve "sub-partition" handling with TRX partition
         parser; partitions can now be created as sub-partitions of another
         partition
    
      SPINOR updates, from Cyrille Pitchen and Marek Vasut:
       - introduce support to the SPI 1-2-2 and 1-4-4 protocols.
       - introduce support to the Double Data Rate (DDR) mode.
       - introduce support to the Octo SPI protocols.
       - add support to new memory parts for Spansion, Macronix and Winbond.
       - add fixes for the Aspeed, STM32 and Cadence QSPI controler drivers.
       - clean up the st_spi_fsm driver.
    
      NAND updates, from Boris Brezillon:
       - addition of on-die ECC support to Micron driver
       - addition of helpers to help drivers choose most appropriate ECC
         settings
       - deletion of dead-code (cached programming and ->errstat() hook)
       - make sure drivers that do not support the SET/GET FEATURES command
         return ENOTSUPP use a dummy ->set/get_features implementation
         returning -ENOTSUPP (required for Micron on-die ECC)
       - change the semantic of ecc->write_page() for drivers setting the
         NAND_ECC_CUSTOM_PAGE_ACCESS flag
       - support exiting 'GET STATUS' command in default ->cmdfunc()
         implementations
       - change the prototype of ->setup_data_interface()
    
      A bunch of driver related changes:
       - various cleanup, fixes and improvements of the MTK driver
       - OMAP DT bindings fixes
       - support for ->setup_data_interface() in the fsmc driver
       - support for imx7 in the gpmi driver
       - finalization of the denali driver rework (thanks to Masahiro for
         the work he's done on this driver)
       - fix "bitflips in erased pages" handling in the ifc driver
       - addition of PM ops and dynamic timing configuration to the atmel
         driver"
    
    * tag 'for-linus-20170713' of git://git.infradead.org/linux-mtd: (118 commits)
      Documentation: ABI: mtd: describe "offset" more precisely
      mtd: Fix check in mtd_unpoint()
      mtd: nand: mtk: release lock on error path
      mtd: st_spi_fsm: remove SPINOR_OP_RDSR2 and use SPINOR_OP_RDCR instead
      mtd: spi-nor: cqspi: remove duplicate const
      mtd: spi-nor: Add support for Spansion S25FL064L
      mtd: spi-nor: Add support for mx66u51235f
      mtd: nand: mtk: add ->setup_data_interface() hook
      mtd: nand: mtk: remove unneeded mtk_ecc_hw_init from mtk_ecc_resume
      mtd: nand: mtk: remove unneeded mtk_nfc_hw_init from mtk_nfc_resume
      mtd: nand: mtk: disable ecc irq when writing page with hwecc
      mtd: nand: mtk: fix incorrect register setting order about ecc irq
      mtd: partitions: fixup some allocate_partition() whitespace
      mtd: parsers: trx: fix pr_err format for printing offset
      MAINTAINERS: Update SPI NOR subsystem git repositories
      mtd: extract TRX parser out of bcm47xxpart into a separated module
      mtd: partitions: add support for partition parsers
      mtd: partitions: add support for subpartitions
      mtd: partitions: rename "master" to the "parent" where appropriate
      mtd: partitions: remove sysfs files when deleting all master's partitions
      ...
    b5e16170