Commit fdda85f6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux into next/soc 

Pull "This is the pxa changes for v4.17 cycle" from Robert Jarzmik:

 - minor changes for property API
 - clock API fix for ULPI driver warning

It exceptionally contains a merge from the mtd tree from Boris
to prevent any merge conflicts in the PXA tree.

* tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux:
  ARM: pxa/raumfeld: use PROPERTY_ENTRY_U32() directly
  ARM: pxa: ulpi: fix ulpi timeout and slowpath warn
  ARM: pxa: cm-x300: remove inline directive
  ARM: pxa: fix static checker warning in pxa3xx-ulpi
  MAINTAINERS: remove entry for deleted pxa3xx_nand driver
  arm: dts: pxa: use reworked NAND controller driver
  dt-bindings: mtd: remove pxa3xx NAND controller documentation
  mtd: nand: remove useless fields from pxa3xx NAND platform data
  mtd: nand: remove deprecated pxa3xx_nand driver
  mtd: nand: use Marvell reworked NAND controller driver with all platforms
parents 40590db6 0b812927

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

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
PXA3xx NAND DT bindings



Required properties:



 - compatible:		Should be set to one of the following:

			marvell,pxa3xx-nand

			marvell,armada370-nand

			marvell,armada-8k-nand

 - reg: 		The register base for the controller

 - interrupts:		The interrupt to map

 - #address-cells:	Set to <1> if the node includes partitions

 - marvell,system-controller: Set to retrieve the syscon node that handles

			NAND controller related registers (only required

			with marvell,armada-8k-nand compatible).



Optional properties:



 - dmas:			dma data channel, see dma.txt binding doc

 - marvell,nand-enable-arbiter:	Set to enable the bus arbiter

 - marvell,nand-keep-config:	Set to keep the NAND controller config as set

				by the bootloader

 - num-cs:			Number of chipselect lines to use

 - nand-on-flash-bbt: 		boolean to enable on flash bbt option if

				not present false

 - nand-ecc-strength:           number of bits to correct per ECC step

 - nand-ecc-step-size:          number of data bytes covered by a single ECC step



The following ECC strength and step size are currently supported:



 - nand-ecc-strength = <1>, nand-ecc-step-size = <512>

 - nand-ecc-strength = <4>, nand-ecc-step-size = <512>

 - nand-ecc-strength = <8>, nand-ecc-step-size = <512>



Example:



	nand0: nand@43100000 {

		compatible = "marvell,pxa3xx-nand";

		reg = <0x43100000 90>;

		interrupts = <45>;

		dmas = <&pdma 97 0>;

		dma-names = "data";

		#address-cells = <1>;



		marvell,nand-enable-arbiter;

		marvell,nand-keep-config;

		num-cs = <1>;



		/* partitions (optional) */

	};

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -11365,12 +11365,6 @@ F: include/sound/pxa2xx-lib.h 
F:	sound/arm/pxa*

F:	sound/soc/pxa/



PXA3xx NAND FLASH DRIVER

M:	Ezequiel Garcia <ezequiel.garcia@free-electrons.com>

L:	linux-mtd@lists.infradead.org

S:	Maintained

F:	drivers/mtd/nand/pxa3xx_nand.c



QAT DRIVER

M:	Giovanni Cabiddu <giovanni.cabiddu@intel.com>

L:	qat-linux@intel.com

arch/arm/boot/dts/pxa3xx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -117,15 +117,15 @@ 
			status = "disabled";

		};



		nand0: nand@43100000 {

			compatible = "marvell,pxa3xx-nand";

		nand_controller: nand-controller@43100000 {

			compatible = "marvell,pxa3xx-nand-controller";

			reg = <0x43100000 90>;

			interrupts = <45>;

			clocks = <&clks CLK_NAND>;

			dmas = <&pdma 97 3>;

			dma-names = "data";

			#address-cells = <1>;

			#size-cells = <1>;	

			#size-cells = <0>;

			status = "disabled";

		};

arch/arm/configs/cm_x300_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_PXA3xx=y

CONFIG_MTD_NAND_MARVELL=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

arch/arm/configs/pxa3xx_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_PXA3xx=y

CONFIG_MTD_NAND_PXA3xx_BUILTIN=y

CONFIG_MTD_NAND_MARVELL=y

CONFIG_MTD_ONENAND=y

CONFIG_MTD_ONENAND_VERIFY_WRITE=y

CONFIG_MTD_ONENAND_GENERIC=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE