Merge branch 'next/boards' into HEAD

Conflicts:
	arch/arm/mach-shmobile/board-armadillo800eva.c

1 files changed, 13 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index 0c49caa09978..d69a7999a12b 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -62,35 +62,43 @@
 
                 up {
                         label = "Up";
-                        gpios = <&gpx2 0 0 0 2>;
+                        gpios = <&gpx2 0 0 0x10000 2>;
                         linux,code = <103>;
                 };
 
                 down {
                         label = "Down";
-                        gpios = <&gpx2 1 0 0 2>;
+                        gpios = <&gpx2 1 0 0x10000 2>;
                         linux,code = <108>;
                 };
 
                 back {
                         label = "Back";
-                        gpios = <&gpx1 7 0 0 2>;
+                        gpios = <&gpx1 7 0 0x10000 2>;
                         linux,code = <158>;
                 };
 
                 home {
                         label = "Home";
-                        gpios = <&gpx1 6 0 0 2>;
+                        gpios = <&gpx1 6 0 0x10000 2>;
                         linux,code = <102>;
                 };
 
                 menu {
                         label = "Menu";
-                        gpios = <&gpx1 5 0 0 2>;
+                        gpios = <&gpx1 5 0 0x10000 2>;
                         linux,code = <139>;
                 };
         };
 
+        leds {
+                compatible = "gpio-leds";
+                status {
+                        gpios = <&gpx1 3 0 0x10000 2>;
+                        linux,default-trigger = "heartbeat";
+                };
+        };
+
         keypad@100A0000 {
                 status = "disabled";
         };