From 362fb9dd67178959d5ad69837d693ef9a09b5215 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 15 Oct 2012 16:48:04 +0800
Subject: [PATCH] --- yaml --- r: 334615 b: refs/heads/master c:
 3d76f9f5d3f6c88c576ebd92c3e2edb6d6a27e6f h: refs/heads/master i:   334613:
 288ab0f37bdb092861c9fad3e592c84e0cf36060   334611:
 e6015defa987aea35279960cfabe405af9fd0278   334607:
 57f9ec5ba0bb2a7c24dbf4864b29f1f64fd9a406 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/arm/boot/dts/imx6q-arm2.dts | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e1c09fb913e4..804de3c083d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5448a279ebf2a8e4cc7289ff1ef382b3e71b8ea6
+refs/heads/master: 3d76f9f5d3f6c88c576ebd92c3e2edb6d6a27e6f
diff --git a/trunk/arch/arm/boot/dts/imx6q-arm2.dts b/trunk/arch/arm/boot/dts/imx6q-arm2.dts
index 15df4c105e89..5bfa02a3f85c 100644
--- a/trunk/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/trunk/arch/arm/boot/dts/imx6q-arm2.dts
@@ -37,6 +37,13 @@
 					pinctrl_hog: hoggrp {
 						fsl,pins = <
 							176  0x80000000	/* MX6Q_PAD_EIM_D25__GPIO_3_25 */
+						>;
+					};
+				};
+
+				arm2 {
+					pinctrl_usdhc3_arm2: usdhc3grp-arm2 {
+						fsl,pins = <
 							1363 0x80000000	/* MX6Q_PAD_NANDF_CS0__GPIO_6_11 */
 							1369 0x80000000 /* MX6Q_PAD_NANDF_CS1__GPIO_6_14 */
 						>;
@@ -58,7 +65,8 @@
 				wp-gpios = <&gpio6 14 0>;
 				vmmc-supply = <&reg_3p3v>;
 				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_usdhc3_1>;
+				pinctrl-0 = <&pinctrl_usdhc3_1
+					     &pinctrl_usdhc3_arm2>;
 				status = "okay";
 			};