Merge branch 'drm-rockchip-next-fixes-2016-03-28' of https://github.com/markyzq/kerne...

[cascardo/linux.git] / arch / arm / boot / dts / s5pv210-goni.dts

diff --git a/arch/arm/boot/dts/s5pv210-goni.dts b/arch/arm/boot/dts/s5pv210-goni.dts
index 3b76eee..0a33d40 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-goni.dts
+++ b/arch/arm/boot/dts/s5pv210-goni.dts
@@ -239,7 +239,7 @@
                        linux,code = <KEY_POWER>;
                        label = "power";
                        debounce-interval = <1>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 };
@@ -250,7 +250,7 @@
 
 &keypad {
        linux,input-no-autorepeat;
-       linux,input-wakeup;
+       wakeup-source;
        samsung,keypad-num-rows = <3>;
        samsung,keypad-num-columns = <3>;
        pinctrl-names = "default";