From 722e3709802ec8a78b40b528176d38c99fd65c3d Mon Sep 17 00:00:00 2001
From: Afzal Mohammed <afzal@ti.com>
Date: Fri, 5 Oct 2012 11:39:54 +0530
Subject: [PATCH] --- yaml --- r: 339614 b: refs/heads/master c:
 eb77b6a78ac7f63985a3f592baf80ff33d213c48 h: refs/heads/master v: v3

---
 [refs]                                                | 2 +-
 trunk/arch/arm/mach-omap2/gpmc-onenand.c              | 5 +++++
 trunk/include/linux/platform_data/mtd-onenand-omap2.h | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1aaf431a67f3..05cb8f6563cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ea1e4ba7bec0a3d490a846376140643e4860536
+refs/heads/master: eb77b6a78ac7f63985a3f592baf80ff33d213c48
diff --git a/trunk/arch/arm/mach-omap2/gpmc-onenand.c b/trunk/arch/arm/mach-omap2/gpmc-onenand.c
index 06fd84657218..4a1c0b7ab432 100644
--- a/trunk/arch/arm/mach-omap2/gpmc-onenand.c
+++ b/trunk/arch/arm/mach-omap2/gpmc-onenand.c
@@ -428,6 +428,11 @@ void __init gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data)
 		gpmc_onenand_data->flags |= ONENAND_SYNC_READ;
 	}
 
+	if (cpu_is_omap34xx())
+		gpmc_onenand_data->flags |= ONENAND_IN_OMAP34XX;
+	else
+		gpmc_onenand_data->flags &= ~ONENAND_IN_OMAP34XX;
+
 	err = gpmc_cs_request(gpmc_onenand_data->cs, ONENAND_IO_SIZE,
 				(unsigned long *)&gpmc_onenand_resource.start);
 	if (err < 0) {
diff --git a/trunk/include/linux/platform_data/mtd-onenand-omap2.h b/trunk/include/linux/platform_data/mtd-onenand-omap2.h
index 21bb0ff4052e..ef9c60d4b29b 100644
--- a/trunk/include/linux/platform_data/mtd-onenand-omap2.h
+++ b/trunk/include/linux/platform_data/mtd-onenand-omap2.h
@@ -14,6 +14,7 @@
 
 #define ONENAND_SYNC_READ	(1 << 0)
 #define ONENAND_SYNC_READWRITE	(1 << 1)
+#define	ONENAND_IN_OMAP34XX	(1 << 2)
 
 struct omap_onenand_platform_data {
 	int			cs;