Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5e16170 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20170713' of git://git.infradead.org/linux-mtd 

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
  ...
parents da16dd97 7d84120b

Documentation/ABI/testing/sysfs-class-mtd

+3 −3
Original line number Diff line number Diff line
@@ -229,6 +229,6 @@ KernelVersion: 4.1 
Contact:	linux-mtd@lists.infradead.org

Description:

		For a partition, the offset of that partition from the start

		of the master device in bytes. This attribute is absent on

		main devices, so it can be used to distinguish between

		partitions and devices that aren't partitions.
 
		of the parent (another partition or a flash device) in bytes.

		This attribute is absent on flash devices, so it can be used

		to distinguish them from partitions.

Documentation/devicetree/bindings/mtd/denali-nand.txt

+13 −0
Original line number Diff line number Diff line
@@ -3,10 +3,23 @@ 
Required properties:

  - compatible : should be one of the following:

      "altr,socfpga-denali-nand"            - for Altera SOCFPGA

      "socionext,uniphier-denali-nand-v5a"  - for Socionext UniPhier (v5a)

      "socionext,uniphier-denali-nand-v5b"  - for Socionext UniPhier (v5b)

  - reg : should contain registers location and length for data and reg.

  - reg-names: Should contain the reg names "nand_data" and "denali_reg"

  - interrupts : The interrupt number.



Optional properties:

  - nand-ecc-step-size: see nand.txt for details.  If present, the value must be

      512        for "altr,socfpga-denali-nand"

      1024       for "socionext,uniphier-denali-nand-v5a"

      1024       for "socionext,uniphier-denali-nand-v5b"

  - nand-ecc-strength: see nand.txt for details.  Valid values are:

      8, 15      for "altr,socfpga-denali-nand"

      8, 16, 24  for "socionext,uniphier-denali-nand-v5a"

      8, 16      for "socionext,uniphier-denali-nand-v5b"

  - nand-ecc-maximize: see nand.txt for details



The device tree may optionally contain sub-nodes describing partitions of the

address space. See partition.txt for more detail.

Documentation/devicetree/bindings/mtd/elm.txt

+1 −1
Original line number Diff line number Diff line 
Error location module



Required properties:

- compatible: Must be "ti,am33xx-elm"

- compatible: Must be "ti,am3352-elm"

- reg: physical base address and size of the registers map.

- interrupts: Interrupt number for the elm.

Documentation/devicetree/bindings/mtd/gpmc-nand.txt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ the GPMC controller with a name of "nand". 


All timing relevant properties as well as generic gpmc child properties are

explained in a separate documents - please refer to

Documentation/devicetree/bindings/bus/ti-gpmc.txt

Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt



For NAND specific properties such as ECC modes or bus width, please refer to

Documentation/devicetree/bindings/mtd/nand.txt

Documentation/devicetree/bindings/mtd/gpmc-nor.txt

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ child nodes of the GPMC controller with a name of "nor". 


All timing relevant properties as well as generic GPMC child properties are

explained in a separate documents. Please refer to

Documentation/devicetree/bindings/bus/ti-gpmc.txt

Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt



Required properties:

- bank-width: 		Width of NOR flash in bytes. GPMC supports 8-bit and
@@ -28,7 +28,7 @@ Required properties: 


Optional properties:

- gpmc,XXX		Additional GPMC timings and settings parameters. See

			Documentation/devicetree/bindings/bus/ti-gpmc.txt

			Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt



Optional properties for partition table parsing:

- #address-cells: should be set to 1