[PATCH 05/11] ARM: nomadik: add FSMC NAND

[Mark Rutland]

On Mon, Jan 07, 2013 at 10:56:20PM +0000, Linus Walleij wrote:
> This adds the FSMC NAND driver and flash partitions to the Nomadik
> device tree.
> 
> The only compatible string accepted by this driver is currently
> "st,spear600-fsmc-nand" which is inappropriate for this system, so
> this patch adds the compatible value "stericsson,fsmc-nand" as
> well.
> 
> Cc: linux-mtd at vger.kernel.org
> Cc: David Woodhouse <dwmw2 at infradead.org>
> Cc: Artem Bityutskiy <dedekind1 at gmail.com>
> Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
> ---
> I'm requesting an ACK from the MTD maintainers to be able to apply
> this patch through the ARM SoC tree.
> ---
>  .../devicetree/bindings/mtd/fsmc-nand.txt          |  2 +-
>  arch/arm/boot/dts/ste-nomadik-stn8815.dtsi         | 38 ++++++++++++++++++++++
>  arch/arm/mach-nomadik/cpu-8815.c                   | 15 +++++++++
>  drivers/mtd/nand/fsmc_nand.c                       |  1 +
>  4 files changed, 55 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/mtd/fsmc-nand.txt b/Documentation/devicetree/bindings/mtd/fsmc-nand.txt
> index e3ea32e..2240ac0 100644
> --- a/Documentation/devicetree/bindings/mtd/fsmc-nand.txt
> +++ b/Documentation/devicetree/bindings/mtd/fsmc-nand.txt
> @@ -1,7 +1,7 @@
>  * FSMC NAND
>  
>  Required properties:
> -- compatible : "st,spear600-fsmc-nand"
> +- compatible : "st,spear600-fsmc-nand", "stericsson,fsmc-nand"
>  - reg : Address range of the mtd chip
>  - reg-names: Should contain the reg names "fsmc_regs", "nand_data", "nand_addr" and "nand_cmd"
>  
> diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
> index 29986ea..8369eb0 100644
> --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
> +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
> @@ -32,6 +32,44 @@
>  		interrupts = <5>;
>  	};
>  
> +	/* A NAND flash of 128 MiB */
> +	fsmc: flash at 40000000 {
> +		compatible = "stericsson,fsmc-nand";
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		reg = <0x10100000 0x1000	/* FSMC Register*/
> +		       0x40000000 0x2000	/* NAND Base DATA */
> +		       0x41000000 0x2000	/* NAND Base ADDR */
> +		       0x40800000 0x2000>;	/* NAND Base CMD */

Pet peeve: could these be individually bracketed for consistency with how we
handle other multi-cell list properties? e.g.

reg = <0x10100000 0x1000>,	/* FSMC Register*/
      <0x40000000 0x2000>,	/* NAND Base DATA */
      <0x41000000 0x2000>,	/* NAND Base ADDR */
      <0x40800000 0x2000>;	/* NAND Base CMD */

> +		reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
> +		status = "okay";
> +
> +		partition at 0 {
> +		label = "X-Loader(NAND)";
> +			reg = <0x0 0x40000>;
> +		};
> +		partition at 40000 {
> +			label = "MemInit(NAND)";
> +			reg = <0x40000 0x40000>;
> +		};
> +		partition at 80000 {
> +			label = "BootLoader(NAND)";
> +			reg = <0x80000 0x200000>;
> +		};
> +		partition at 280000 {
> +			label = "Kernel zImage(NAND)";
> +			reg = <0x280000 0x300000>;
> +		};
> +		partition at 580000 {
> +			label = "Root Filesystem(NAND)";
> +			reg = <0x580000 0x1600000>;
> +		};
> +		partition at 1b80000 {
> +			label = "User Filesystem(NAND)";
> +			reg = <0x1b80000 0x6480000>;
> +		};
> +	};
> +
>  	amba {
>  		compatible = "arm,amba-bus";
>  		#address-cells = <1>;

[...]

Thanks,
Mark.