ARM: dts: omap3: Fix NAND device nodes

[cascardo/linux.git] / arch / arm / boot / dts / omap3-ldp.dts

diff --git a/arch/arm/boot/dts/omap3-ldp.dts b/arch/arm/boot/dts/omap3-ldp.dts
index 0d0f1a7..2f353da 100644 (file)
--- a/arch/arm/boot/dts/omap3-ldp.dts
+++ b/arch/arm/boot/dts/omap3-ldp.dts
@@ -35,74 +35,78 @@
                        label = "enter";
                        gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; /* gpio101 */
                        linux,code = <KEY_ENTER>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_f1 {
                        label = "f1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_LOW>; /* gpio102 */
                        linux,code = <KEY_F1>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_f2 {
                        label = "f2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_LOW>; /* gpio103 */
                        linux,code = <KEY_F2>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_f3 {
                        label = "f3";
                        gpios = <&gpio4 8 GPIO_ACTIVE_LOW>; /* gpio104 */
                        linux,code = <KEY_F3>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_f4 {
                        label = "f4";
                        gpios = <&gpio4 9 GPIO_ACTIVE_LOW>; /* gpio105 */
                        linux,code = <KEY_F4>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_left {
                        label = "left";
                        gpios = <&gpio4 10 GPIO_ACTIVE_LOW>; /* gpio106 */
                        linux,code = <KEY_LEFT>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_right {
                        label = "right";
                        gpios = <&gpio4 11 GPIO_ACTIVE_LOW>; /* gpio107 */
                        linux,code = <KEY_RIGHT>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_up {
                        label = "up";
                        gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; /* gpio108 */
                        linux,code = <KEY_UP>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_down {
                        label = "down";
                        gpios = <&gpio4 13 GPIO_ACTIVE_LOW>; /* gpio109 */
                        linux,code = <KEY_DOWN>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 };
 
 &gpmc {
-       ranges = <0 0 0x00000000 0x01000000>,
-                <1 0 0x08000000 0x01000000>;
+       ranges = <0 0 0x30000000 0x1000000>,    /* CS0 space, 16MB */
+                <1 0 0x08000000 0x1000000>;    /* CS1 space, 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 */
                linux,mtd-name= "micron,nand";
-               reg = <0 0 4>;  /* CS0, offset 0, IO size 4 */
                nand-bus-width = <16>;
                gpmc,device-width = <2>;
                ti,nand-ecc-opt = "bch8";