From 6ffb6bdf5f0fab6e6d187a005954665f2fa590cc Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Sun, 23 Dec 2012 11:34:36 +0900
Subject: [PATCH] --- yaml --- r: 359935 b: refs/heads/master c:
 92904699173d237c8e907ef7e4ef20a3dff577a4 h: refs/heads/master i:   359933:
 43c5bd85db38ed5de9a5b57188a534ab67d2ddb8   359931:
 c10c03394b69e627ff3a31e94b2d8639f0f29ad6   359927:
 89d4325691ddf160c316cca8c780f076297514b9   359919:
 8474aa2e7b3846410f35b08c92c29f61f15897aa   359903:
 531a42d0dc7b5c425aff0f2e1052a3be1b27ff46   359871:
 81b845409ae4fca3d0be0c24d91a4a20314d5e42   359807:
 fdc96d0799397e748847fb6b244320f662a24de2   359679:
 ed40ea89f9ee9578e786f6e579bba77d537f7190   359423:
 afe6e6d0034aeffacd487b0093c9937658635232 v: v3

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

diff --git a/[refs] b/[refs]
index 8762c740fc28..a16525dadc77 100644
--- 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
index 64b937441fa0..192cf76fbf93 100644
--- 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";