ARM: dts: omap3: Fix NAND device nodes

[cascardo/linux.git] / arch / arm / boot / dts / omap3-pandora-common.dtsi

diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index cfe140c..bcf39d6 100644 (file)
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -84,112 +84,112 @@
                        label = "up";
                        linux,code = <KEY_UP>;
                        gpios = <&gpio4 14 GPIO_ACTIVE_LOW>;    /* GPIO_110 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                down-button {
                        label = "down";
                        linux,code = <KEY_DOWN>;
                        gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;     /* GPIO_103 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                left-button {
                        label = "left";
                        linux,code = <KEY_LEFT>;
                        gpios = <&gpio4 0 GPIO_ACTIVE_LOW>;     /* GPIO_96 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                right-button {
                        label = "right";
                        linux,code = <KEY_RIGHT>;
                        gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;     /* GPIO_98 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                pageup-button {
                        label = "game 1";
                        linux,code = <KEY_PAGEUP>;
                        gpios = <&gpio4 13 GPIO_ACTIVE_LOW>;    /* GPIO_109 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                pagedown-button {
                        label = "game 3";
                        linux,code = <KEY_PAGEDOWN>;
                        gpios = <&gpio4 10 GPIO_ACTIVE_LOW>;    /* GPIO_106 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                home-button {
                        label = "game 4";
                        linux,code = <KEY_HOME>;
                        gpios = <&gpio4 5 GPIO_ACTIVE_LOW>;     /* GPIO_101 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                end-button {
                        label = "game 2";
                        linux,code = <KEY_END>;
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;    /* GPIO_111 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                right-shift {
                        label = "l";
                        linux,code = <KEY_RIGHTSHIFT>;
                        gpios = <&gpio4 6 GPIO_ACTIVE_LOW>;     /* GPIO_102 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                kp-plus {
                        label = "l2";
                        linux,code = <KEY_KPPLUS>;
                        gpios = <&gpio4 1 GPIO_ACTIVE_LOW>;     /* GPIO_97 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                right-ctrl {
                        label = "r";
                        linux,code = <KEY_RIGHTCTRL>;
                        gpios = <&gpio4 9 GPIO_ACTIVE_LOW>;     /* GPIO_105 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                kp-minus {
                        label = "r2";
                        linux,code = <KEY_KPMINUS>;
                        gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;    /* GPIO_107 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                left-ctrl {
                        label = "ctrl";
                        linux,code = <KEY_LEFTCTRL>;
                        gpios = <&gpio4 8 GPIO_ACTIVE_LOW>;     /* GPIO_104 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                menu {
                        label = "menu";
                        linux,code = <KEY_MENU>;
                        gpios = <&gpio4 3 GPIO_ACTIVE_LOW>;     /* GPIO_99 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                hold {
                        label = "hold";
                        linux,code = <KEY_COFFEE>;
                        gpios = <&gpio6 16 GPIO_ACTIVE_LOW>;    /* GPIO_176 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                left-alt {
                        label = "alt";
                        linux,code = <KEY_LEFTALT>;
                        gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;    /* GPIO_100 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                lid {
@@ -546,7 +546,11 @@
        ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */
 
        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 */
                nand-bus-width = <16>;
                ti,nand-ecc-opt = "sw";
 
@@ -617,7 +621,7 @@
                ti,x-plate-ohms = /bits/ 16 <40>;
                ti,pressure-max = /bits/ 16 <255>;
 
-               linux,wakeup;
+               wakeup-source;
        };
 
        lcd: lcd@1 {