Merge branch 'next/dt-samsung' into next/dt-samsung-new

[linux-beck.git] / arch / arm / boot / dts / exynos4210-origen.dts

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index c525e98f4953de2c38032f6c56e4c55793ceff80..3e68f52e8454431d90c5bd1d47de5b791ce56b2e 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -64,37 +64,45 @@
 
                up {
                        label = "Up";
-                       gpios = <&gpx2 0 0 0 2>;
+                       gpios = <&gpx2 0 0 0x10000 2>;
                        linux,code = <103>;
                        gpio-key,wakeup;
                };
 
                down {
                        label = "Down";
-                       gpios = <&gpx2 1 0 0 2>;
+                       gpios = <&gpx2 1 0 0x10000 2>;
                        linux,code = <108>;
                        gpio-key,wakeup;
                };
 
                back {
                        label = "Back";
-                       gpios = <&gpx1 7 0 0 2>;
+                       gpios = <&gpx1 7 0 0x10000 2>;
                        linux,code = <158>;
                        gpio-key,wakeup;
                };
 
                home {
                        label = "Home";
-                       gpios = <&gpx1 6 0 0 2>;
+                       gpios = <&gpx1 6 0 0x10000 2>;
                        linux,code = <102>;
                        gpio-key,wakeup;
                };
 
                menu {
                        label = "Menu";
-                       gpios = <&gpx1 5 0 0 2>;
+                       gpios = <&gpx1 5 0 0x10000 2>;
                        linux,code = <139>;
                        gpio-key,wakeup;
                };
        };
+
+       leds {
+               compatible = "gpio-leds";
+               status {
+                       gpios = <&gpx1 3 0 0x10000 2>;
+                       linux,default-trigger = "heartbeat";
+               };
+       };
 };