Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / arch / arm / boot / dts / am437x-cm-t43.dts

diff --git a/arch/arm/boot/dts/am437x-cm-t43.dts b/arch/arm/boot/dts/am437x-cm-t43.dts
index 8677f4c..9551c47 100644 (file)
--- a/arch/arm/boot/dts/am437x-cm-t43.dts
+++ b/arch/arm/boot/dts/am437x-cm-t43.dts
@@ -146,7 +146,11 @@
        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>;
 
@@ -166,17 +170,12 @@
                gpmc,access-ns = <64>;
                gpmc,rd-cycle-ns = <82>;
                gpmc,wr-cycle-ns = <82>;
-               gpmc,wait-on-read = "true";
-               gpmc,wait-on-write = "true";
                gpmc,bus-turnaround-ns = <0>;
                gpmc,cycle2cycle-delay-ns = <0>;
                gpmc,clk-activation-ns = <0>;
-               gpmc,wait-monitoring-ns = <0>;
                gpmc,wr-access-ns = <40>;
                gpmc,wr-data-mux-bus-ns = <0>;
 
-               gpmc,wait-pin = <0>;
-
                #address-cells = <1>;
                #size-cells = <1>;
                /* MTD partition table */