Merge tag 'iwlwifi-for-kalle-2015-07-30' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos5250-spring.dts

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index c41600e587e06ec978289cdd87bc7e60cfe0449c..d03f9b8d376d082308fa9e06c515f69ae83386c2 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -25,6 +25,7 @@
 
        chosen {
                bootargs = "console=tty1";
+               stdout-path = "serial3:115200n8";
        };
 
        gpio-keys {
@@ -482,7 +483,7 @@
 
        power_key_irq: power-key-irq {
                samsung,pins = "gpx1-3";
-               samsung,pin-function = <0>;
+               samsung,pin-function = <0xf>;
                samsung,pin-pud = <0>;
                samsung,pin-drv = <0>;
        };
@@ -510,7 +511,7 @@
 
        lid_irq: lid-irq {
                samsung,pins = "gpx3-5";
-               samsung,pin-function = <0>;
+               samsung,pin-function = <0xf>;
                samsung,pin-pud = <0>;
                samsung,pin-drv = <0>;
        };