ARM: dts: am437x: Fix NAND device nodes

[cascardo/linux.git] / arch / arm / boot / dts / am437x-gp-evm.dts

diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index 7f00e85..7081b88 100644 (file)
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -734,8 +734,8 @@
        status = "okay";
        /* these are on the crossbar and are outlined in the
           xbar-event-map element */
-       dmas = <&edma 30
-               &edma 31>;
+       dmas = <&edma_xbar 30 0 1>,
+               <&edma_xbar 31 0 2>;
        dma-names = "tx", "rx";
        vmmc-supply = <&vmmcwl_fixed>;
        bus-width = <4>;
@@ -756,11 +756,6 @@
        };
 };
 
-&edma {
-       ti,edma-xbar-event-map = /bits/ 16 <1 30
-                                           2 31>;
-};
-
 &uart3 {
        status = "okay";
        pinctrl-names = "default";
@@ -817,9 +812,13 @@
        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>;