From 0991b02c9c57ee1db3a25011019da6c87ce98b8b Mon Sep 17 00:00:00 2001
From: Lauri Hintsala <lauri.hintsala@bluegiga.com>
Date: Tue, 10 Jul 2012 10:08:07 +0300
Subject: [PATCH] --- yaml --- r: 313304 b: refs/heads/master c:
 3317d99e444988e71a32edbca092b1aed098c2f1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fc0fa5841981..7ee42ec45f76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 841730e74393a9f6b10fb22cb1d5047de6246119
+refs/heads/master: 3317d99e444988e71a32edbca092b1aed098c2f1
diff --git a/trunk/arch/arm/boot/dts/apx4devkit.dts b/trunk/arch/arm/boot/dts/apx4devkit.dts
index 04664bce194e..51ed36a6413c 100644
--- a/trunk/arch/arm/boot/dts/apx4devkit.dts
+++ b/trunk/arch/arm/boot/dts/apx4devkit.dts
@@ -11,6 +11,12 @@
 
 	apb@80000000 {
 		apbh@80000000 {
+			gpmi-nand@8000c000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+				status = "okay";
+			};
+
 			ssp0: ssp@80010000 {
 				compatible = "fsl,imx28-mmc";
 				pinctrl-names = "default";