From 7bf64c10ce994fcee5dd36256ae7924abaf29f78 Mon Sep 17 00:00:00 2001
From: AnilKumar Ch <anilkumar@ti.com>
Date: Tue, 6 Nov 2012 19:18:31 +0530
Subject: [PATCH] --- yaml --- r: 339903 b: refs/heads/master c:
 404aa0d71ddd82189ef3680d6c41f127dc89d29f h: refs/heads/master i:   339901:
 94aa8525e155e8fd515ddf7a5ecbaa9a5acbbb8c   339899:
 6d8101b04727029f8415e83941080f4822145f97   339895:
 d4be2eced02b03a0bde18cb2c12df3df50fc9dcd   339887:
 06a7478bd2d291648acbe032c0ea16ccdc4696f9   339871:
 f6f87ea716cae4e899825f56900ac3a802284563   339839:
 f54353621b1b62d9692929723351c384037aa446 v: v3

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

diff --git a/[refs] b/[refs]
index ce09cdaff71a..a3a20dfb887b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ca1d317aa78492f206d3e325965a990aa33a226
+refs/heads/master: 404aa0d71ddd82189ef3680d6c41f127dc89d29f
diff --git a/trunk/arch/arm/boot/dts/am335x-evm.dts b/trunk/arch/arm/boot/dts/am335x-evm.dts
index 8076e66f9367..e087b8751e0c 100644
--- a/trunk/arch/arm/boot/dts/am335x-evm.dts
+++ b/trunk/arch/arm/boot/dts/am335x-evm.dts
@@ -26,7 +26,7 @@
 
 	am33xx_pinmux: pinmux@44e10800 {
 		pinctrl-names = "default";
-		pinctrl-0 = <&matrix_keypad_s0>;
+		pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0>;
 
 		matrix_keypad_s0: matrix_keypad_s0 {
 			pinctrl-single,pins = <
@@ -37,6 +37,13 @@
 				0x6c 0x27	/* gpmc_a11.gpio1_27, INPUT | MODE7 */
 			>;
 		};
+
+		volume_keys_s0: volume_keys_s0 {
+			pinctrl-single,pins = <
+				0x150 0x27	/* spi0_sclk.gpio0_2, INPUT | MODE7 */
+				0x154 0x27	/* spi0_d0.gpio0_3, INPUT | MODE7 */
+			>;
+		};
 	};
 
 	ocp {