From 595b89afc3aa3ccdaef93effdb10e1bfa337c216 Mon Sep 17 00:00:00 2001
From: AnilKumar Ch <anilkumar@ti.com>
Date: Tue, 6 Nov 2012 19:18:37 +0530
Subject: [PATCH] --- yaml --- r: 339909 b: refs/heads/master c:
 d98258b81721d452d2da98e9fc83c57e6ef70667 h: refs/heads/master i:   339907:
 886641b517f3761c15484213f65a86eed4a51024 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/boot/dts/am335x-evmsk.dts | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4b725c7d73b9..ff2e6b5e0063 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29b0b84381221e94063ceb4129f4e4bc1bce1215
+refs/heads/master: d98258b81721d452d2da98e9fc83c57e6ef70667
diff --git a/trunk/arch/arm/boot/dts/am335x-evmsk.dts b/trunk/arch/arm/boot/dts/am335x-evmsk.dts
index 7262fa83b8d1..0f825dd2d178 100644
--- a/trunk/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/trunk/arch/arm/boot/dts/am335x-evmsk.dts
@@ -32,7 +32,7 @@
 
 	am33xx_pinmux: pinmux@44e10800 {
 		pinctrl-names = "default";
-		pinctrl-0 = <&user_leds_s0>;
+		pinctrl-0 = <&user_leds_s0 &gpio_keys_s0>;
 
 		user_leds_s0: user_leds_s0 {
 			pinctrl-single,pins = <
@@ -42,6 +42,15 @@
 				0x1c 0x7	/* gpmc_ad7.gpio1_7, OUTPUT | MODE7 */
 			>;
 		};
+
+		gpio_keys_s0: gpio_keys_s0 {
+			pinctrl-single,pins = <
+				0x94 0x27	/* gpmc_oen_ren.gpio2_3, INPUT | MODE7 */
+				0x90 0x27	/* gpmc_advn_ale.gpio2_2, INPUT | MODE7 */
+				0x70 0x27	/* gpmc_wait0.gpio0_30, INPUT | MODE7 */
+				0x9c 0x27	/* gpmc_ben0_cle.gpio2_5, INPUT | MODE7 */
+			>;
+		};
 	};
 
 	ocp {