Commit d1f936d7 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

Merge tag 'nand/for-4.14' of git://git.infradead.org/l2-mtd into mtd/next 

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

* Fix memory leaks in the core
* Remove unused NAND locking support
* Rename nand.h into rawnand.h (preparing support for spi NANDs)
* Use NAND_MAX_ID_LEN where appropriate
* Fix support for 20nm Hynix chips
* Fix support for Samsung and Hynix SLC NANDs

and the following driver changes:

* Various cleanup, improvements and fixes in the qcom driver
* Fixes for bugs detected by various static code analysis tools
* Fix mxc ooblayout definition
* Add a new part_parsers to tmio and sharpsl platform data in order to
  define a custom list of partition parsers
* Request the reset line in exclusive mode in the sunxi driver
* Fix a build error in the orion-nand driver when compiled for ARMv4
* Allow 64-bit mvebu platforms to select the PXA3XX driver
"
parents a52329a9 2d2a2b8c

Documentation/devicetree/bindings/mtd/qcom_nandc.txt

+59 −6
Original line number Diff line number Diff line 
* Qualcomm NAND controller



Required properties:

- compatible:		should be "qcom,ipq806x-nand"

- compatible:		must be one of the following:

    * "qcom,ipq806x-nand" - for EBI2 NAND controller being used in IPQ806x

			    SoC and it uses ADM DMA

    * "qcom,ipq4019-nand" - for QPIC NAND controller v1.4.0 being used in

                            IPQ4019 SoC and it uses BAM DMA

    * "qcom,ipq8074-nand" - for QPIC NAND controller v1.5.0 being used in

                            IPQ8074 SoC and it uses BAM DMA



- reg:			MMIO address range

- clocks:		must contain core clock and always on clock

- clock-names:		must contain "core" for the core clock and "aon" for the

			always on clock



EBI2 specific properties:

- dmas:			DMA specifier, consisting of a phandle to the ADM DMA

			controller node and the channel number to be used for

			NAND. Refer to dma.txt and qcom_adm.txt for more details
@@ -16,6 +25,12 @@ Required properties: 
- qcom,data-crci:	must contain the ADM data type CRCI block instance

			number specified for the NAND controller on the given

			platform



QPIC specific properties:

- dmas:			DMA specifier, consisting of a phandle to the BAM DMA

			and the channel number to be used for NAND. Refer to

			dma.txt, qcom_bam_dma.txt for more details

- dma-names:		must contain all 3 channel names : "tx", "rx", "cmd"

- #address-cells:	<1> - subnodes give the chip-select number

- #size-cells:		<0>
@@ -26,7 +41,6 @@ chip-selects which (may) contain NAND flash chips. Their properties are as 
follows.



Required properties:

- compatible:		should contain "qcom,nandcs"

- reg:			a single integer representing the chip-select

			number (e.g., 0, 1, 2, etc.)

- #address-cells:	see partition.txt
@@ -43,8 +57,8 @@ partition.txt for more detail. 


Example:



nand@1ac00000 {

	compatible = "qcom,ebi2-nandc";

nand-controller@1ac00000 {

	compatible = "qcom,ipq806x-nand";

	reg = <0x1ac00000 0x800>;



	clocks = <&gcc EBI2_CLK>,
@@ -59,8 +73,7 @@ nand@1ac00000 { 
	#address-cells = <1>;

	#size-cells = <0>;



	nandcs@0 {

		compatible = "qcom,nandcs";

	nand@0 {

		reg = <0>;



		nand-ecc-strength = <4>;
@@ -84,3 +97,43 @@ nand@1ac00000 { 
		};

	};

};



nand-controller@79b0000 {

	compatible = "qcom,ipq4019-nand";

	reg = <0x79b0000 0x1000>;



	clocks = <&gcc GCC_QPIC_CLK>,

		<&gcc GCC_QPIC_AHB_CLK>;

	clock-names = "core", "aon";



	dmas = <&qpicbam 0>,

		<&qpicbam 1>,

		<&qpicbam 2>;

	dma-names = "tx", "rx", "cmd";



	#address-cells = <1>;

	#size-cells = <0>;



	nand@0 {

		reg = <0>;

		nand-ecc-strength = <4>;

		nand-ecc-step-size = <512>;

		nand-bus-width = <8>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "boot-nand";

				reg = <0 0x58a0000>;

			};



			partition@58a0000 {

				label = "fs-nand";

				reg = <0x58a0000 0x4000000>;

			};

		};

	};

};

Documentation/driver-api/mtdnand.rst

+4 −4
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ mirrored table is performed. 


The most important field in the nand_bbt_descr structure is the

options field. The options define most of the table properties. Use the

predefined constants from nand.h to define the options.

predefined constants from rawnand.h to define the options.



-  Number of bits per block
@@ -843,7 +843,7 @@ Chip option constants 
Constants for chip id table

~~~~~~~~~~~~~~~~~~~~~~~~~~~



These constants are defined in nand.h. They are OR-ed together to

These constants are defined in rawnand.h. They are OR-ed together to

describe the chip functionality::



    /* Buswitdh is 16 bit */
@@ -865,7 +865,7 @@ describe the chip functionality:: 
Constants for runtime options

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



These constants are defined in nand.h. They are OR-ed together to

These constants are defined in rawnand.h. They are OR-ed together to

describe the functionality::



    /* The hw ecc generator provides a syndrome instead a ecc value on read
@@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked 
with an [XXX] identifier. See the chapter "Documentation hints" for an

explanation.



.. kernel-doc:: include/linux/mtd/nand.h

.. kernel-doc:: include/linux/mtd/rawnand.h

   :internal:



Public Functions Provided

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -9027,7 +9027,7 @@ T: git git://git.infradead.org/linux-mtd.git nand/fixes 
T:	git git://git.infradead.org/l2-mtd.git nand/next

S:	Maintained

F:	drivers/mtd/nand/

F:	include/linux/mtd/nand*.h

F:	include/linux/mtd/*nand*.h



NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER

M:	Daniel Mack <zonque@gmail.com>

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/input/tps6507x-ts.h>

#include <linux/mfd/tps6507x.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/rawnand.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

arch/arm/mach-davinci/board-dm355-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/rawnand.h>

#include <linux/i2c.h>

#include <linux/gpio.h>

#include <linux/clk.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE