---

yaml --- r: 359933 b: refs/heads/master c: 8059fc1 h: refs/heads/master i: 359931: c10c033 v: v3
git-mirror · Feb 28, 2013 · 43c5bd8 · 43c5bd8
1 parent eeea251
commit 43c5bd8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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 {