From 43c5bd85db38ed5de9a5b57188a534ab67d2ddb8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 21 Dec 2012 15:49:13 +0100
Subject: [PATCH] --- yaml --- r: 359933 b: refs/heads/master c:
 8059fc1de2f574db6daec76c0818b31ff840a29d h: refs/heads/master i:   359931:
 c10c03394b69e627ff3a31e94b2d8639f0f29ad6 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/boot/dts/kirkwood-6282.dtsi | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ddd70c398b6f..4bc0668411b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dd8a01003355da95e23e3609e98a968001c3ee8
+refs/heads/master: 8059fc1de2f574db6daec76c0818b31ff840a29d
diff --git a/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi b/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi
index 4ccea2130a6c..ff00dbb28988 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -30,6 +30,11 @@
 				marvell,pins = "mpp13", "mpp14";
 				marvell,function = "uart1";
 			};
+			pmx_sdio: pmx-sdio {
+				marvell,pins = "mpp12", "mpp13", "mpp14",
+					       "mpp15", "mpp16", "mpp17";
+				marvell,function = "sdio";
+			};
 		};
 
 		i2c@11100 {