From e3e5f6415e425275c078e5901a8773fada250749 Mon Sep 17 00:00:00 2001
From: Shiraz Hashim <shiraz.hashim@st.com>
Date: Wed, 7 Mar 2012 17:00:52 +0530
Subject: [PATCH] --- yaml --- r: 298151 b: refs/heads/master c:
 02bfc4ebbd2532440fadd78076f3a51e0ae89f7f h: refs/heads/master i:   298149:
 cb1eaf4dab03da10007aaa960e0abf41ed428241   298147:
 315753cb20cf740d3f0b626bb88b3b759b2149a2   298143:
 b4a87629e2bf2c9cb99ca8c9d2d5ec8d59943ed5 v: v3

---
 [refs]                                            |  2 +-
 trunk/arch/arm/mach-u300/core.c                   |  2 ++
 trunk/arch/arm/mach-u300/include/mach/u300-regs.h |  5 +++++
 trunk/include/linux/mtd/fsmc.h                    | 13 -------------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index e5ab71cc87e5..1b90981aad0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2acc92e144336dd29e30dc5d26439355be750b6
+refs/heads/master: 02bfc4ebbd2532440fadd78076f3a51e0ae89f7f
diff --git a/trunk/arch/arm/mach-u300/core.c b/trunk/arch/arm/mach-u300/core.c
index b4c6926a700c..9c3bafd48cda 100644
--- a/trunk/arch/arm/mach-u300/core.c
+++ b/trunk/arch/arm/mach-u300/core.c
@@ -1574,6 +1574,8 @@ static struct fsmc_nand_platform_data nand_platform_data = {
 	.nr_partitions = ARRAY_SIZE(u300_partitions),
 	.options = NAND_SKIP_BBTSCAN,
 	.width = FSMC_NAND_BW8,
+	.ale_off = PLAT_NAND_ALE,
+	.cle_off = PLAT_NAND_CLE,
 };
 
 static struct platform_device nand_device = {
diff --git a/trunk/arch/arm/mach-u300/include/mach/u300-regs.h b/trunk/arch/arm/mach-u300/include/mach/u300-regs.h
index 035fdc9dbdb0..b9701fb86db6 100644
--- a/trunk/arch/arm/mach-u300/include/mach/u300-regs.h
+++ b/trunk/arch/arm/mach-u300/include/mach/u300-regs.h
@@ -30,6 +30,11 @@
 /* NFIF */
 #define U300_NAND_IF_PHYS_BASE		0x9f800000
 
+/* ALE, CLE offset for FSMC NAND */
+#define PLAT_NAND_CLE			(1 << 16)
+#define PLAT_NAND_ALE			(1 << 17)
+
+
 /* AHB Peripherals */
 #define U300_AHB_PER_PHYS_BASE		0xa0000000
 #define U300_AHB_PER_VIRT_BASE		0xff010000
diff --git a/trunk/include/linux/mtd/fsmc.h b/trunk/include/linux/mtd/fsmc.h
index 2cd655f06e05..e877325d9c51 100644
--- a/trunk/include/linux/mtd/fsmc.h
+++ b/trunk/include/linux/mtd/fsmc.h
@@ -26,19 +26,6 @@
 #define FSMC_NAND_BW8		1
 #define FSMC_NAND_BW16		2
 
-/*
- * The placement of the Command Latch Enable (CLE) and
- * Address Latch Enable (ALE) is twisted around in the
- * SPEAR310 implementation.
- */
-#if defined(CONFIG_MACH_SPEAR310)
-#define PLAT_NAND_CLE		(1 << 17)
-#define PLAT_NAND_ALE		(1 << 16)
-#else
-#define PLAT_NAND_CLE		(1 << 16)
-#define PLAT_NAND_ALE		(1 << 17)
-#endif
-
 #define FSMC_MAX_NOR_BANKS	4
 #define FSMC_MAX_NAND_BANKS	4