---

yaml --- r: 359935 b: refs/heads/master c: 9290469 h: refs/heads/master i: 359933: 43c5bd8 359931: c10c033 359927: 89d4325 359919: 8474aa2 359903: 531a42d 359871: 81b8454 359807: fdc96d0 359679: ed40ea8 359423: afe6e6d v: v3
git-mirror · Feb 28, 2013 · 6ffb6bd · 6ffb6bd
1 parent d47d204
commit 6ffb6bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00211e96507a1f061d38519e2e7e385c74962c5c
+refs/heads/master: 92904699173d237c8e907ef7e4ef20a3dff577a4
diff --git a/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi b/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -5,6 +5,12 @@
 			compatible = "marvell,88f6282-pinctrl";
 			reg = <0x10000 0x20>;
 
+			pmx_nand: pmx-nand {
+				marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
+							"mpp4", "mpp5", "mpp18", "mpp19";
+				marvell,function = "nand";
+			};
+
 			pmx_sata0: pmx-sata0 {
 				marvell,pins = "mpp5", "mpp21", "mpp23";
 				marvell,function = "sata0";