ARM: dts: am437x: Fix NAND device nodes
authorRoger Quadros <rogerq@ti.com>
Tue, 23 Feb 2016 16:37:19 +0000 (18:37 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 26 Feb 2016 18:32:14 +0000 (10:32 -0800)
Add compatible id, GPMC register resource and interrupt
resource to NAND controller nodes.

The GPMC node will provide an interrupt controller for the
NAND IRQs.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/am437x-cm-t43.dts
arch/arm/boot/dts/am437x-gp-evm.dts
arch/arm/boot/dts/am43x-epos-evm.dts

index df955ba4dc6203273ff795cc1492e698764eda0d..7957bd4433719504cc4581e426991f07fcb7828f 100644 (file)
                        gpmc,num-waitpins = <2>;
                        #address-cells = <2>;
                        #size-cells = <1>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                        status = "disabled";
                };
 
index 8677f4cce9e9e01553c317791207bcabf88ab18d..4aa5357b3a8437f07653edda9f565af4c9603c6a 100644 (file)
        pinctrl-0 = <&nand_flash_x8>;
        ranges = <0 0 0x08000000 0x1000000>;
        nand@0,0 {
-               reg = <0 0 0>;
+               compatible = "ti,omap2-nand";
+               reg = <0 0 4>;          /* CS0, offset 0, IO size 4 */
+               interrupt-parent = <&gpmc>;
+               interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+                            <1 IRQ_TYPE_NONE>; /* termcount */
                ti,nand-ecc-opt = "bch8";
                ti,elm-id = <&elm>;
 
index 64d43325bcbc73aa08bf1da025c255883737f233..7081b887bbcc3552007be17197a61768c3aa0362 100644 (file)
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&nand_flash_x8>;
-       ranges = <0 0 0 0x01000000>;    /* minimum GPMC partition = 16MB */
+       ranges = <0 0 0x08000000 0x01000000>;   /* CS0 space. Min partition = 16MB */
        nand@0,0 {
+               compatible = "ti,omap2-nand";
                reg = <0 0 4>;          /* device IO registers */
+               interrupt-parent = <&gpmc>;
+               interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+                            <1 IRQ_TYPE_NONE>; /* termcount */
                ti,nand-ecc-opt = "bch16";
                ti,elm-id = <&elm>;
                nand-bus-width = <8>;
index 746fd2b179587fe4522724f5b42b16202e97edef..12b08cf85517a289989c08956e33066a6b2425bb 100644 (file)
        status = "okay";        /* Disable QSPI when enabling GPMC (NAND) */
        pinctrl-names = "default";
        pinctrl-0 = <&nand_flash_x8>;
-       ranges = <0 0 0x08000000 0x1000000>;    /* CS0: 16MB for NAND */
+       ranges = <0 0 0x08000000 0x01000000>;   /* CS0 space. Min partition = 16MB */
        nand@0,0 {
+               compatible = "ti,omap2-nand";
                reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
+               interrupt-parent = <&gpmc>;
+               interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+                            <1 IRQ_TYPE_NONE>; /* termcount */
                ti,nand-ecc-opt = "bch16";
                ti,elm-id = <&elm>;
                nand-bus-width = <8>;