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

Commit ef32476f authored by Brian Norris's avatar Brian Norris
Browse files

Merge tag 'nand/for-4.13' into MTD 

From Boris:
"""
This pull request contains the following core changes:

* addition of on-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

And as usual we also have a few minor cleanup/fixes/improvements
patches across the subsystem.
"""
parents 8b9ef8f9 81667e9c

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

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

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


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: