From 0cd878df324140d87fd067356f34df6219b5fa88 Mon Sep 17 00:00:00 2001
From: Shiraz Hashim <shiraz.hashim@st.com>
Date: Wed, 7 Mar 2012 17:00:51 +0530
Subject: [PATCH] --- yaml --- r: 298150 b: refs/heads/master c:
 b2acc92e144336dd29e30dc5d26439355be750b6 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/nand/fsmc_nand.c | 9 +++++----
 trunk/include/linux/mtd/fsmc.h     | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 464d8b3d3916..e5ab71cc87e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e29ee57b1d33abf119cb332a3d8fa69c9cd39096
+refs/heads/master: b2acc92e144336dd29e30dc5d26439355be750b6
diff --git a/trunk/drivers/mtd/nand/fsmc_nand.c b/trunk/drivers/mtd/nand/fsmc_nand.c
index abbff77fd106..4dda9bb38334 100644
--- a/trunk/drivers/mtd/nand/fsmc_nand.c
+++ b/trunk/drivers/mtd/nand/fsmc_nand.c
@@ -729,27 +729,28 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
 		goto err_probe1;
 	}
 
-	host->resaddr = request_mem_region(res->start + PLAT_NAND_ALE,
+	host->resaddr = request_mem_region(res->start + pdata->ale_off,
 			resource_size(res), pdev->name);
 	if (!host->resaddr) {
 		ret = -EIO;
 		goto err_probe1;
 	}
 
-	host->addr_va = ioremap(res->start + PLAT_NAND_ALE, resource_size(res));
+	host->addr_va = ioremap(res->start + pdata->ale_off,
+			resource_size(res));
 	if (!host->addr_va) {
 		ret = -EIO;
 		goto err_probe1;
 	}
 
-	host->rescmd = request_mem_region(res->start + PLAT_NAND_CLE,
+	host->rescmd = request_mem_region(res->start + pdata->cle_off,
 			resource_size(res), pdev->name);
 	if (!host->rescmd) {
 		ret = -EIO;
 		goto err_probe1;
 	}
 
-	host->cmd_va = ioremap(res->start + PLAT_NAND_CLE, resource_size(res));
+	host->cmd_va = ioremap(res->start + pdata->cle_off, resource_size(res));
 	if (!host->cmd_va) {
 		ret = -EIO;
 		goto err_probe1;
diff --git a/trunk/include/linux/mtd/fsmc.h b/trunk/include/linux/mtd/fsmc.h
index 6987995ad3cf..2cd655f06e05 100644
--- a/trunk/include/linux/mtd/fsmc.h
+++ b/trunk/include/linux/mtd/fsmc.h
@@ -151,6 +151,11 @@ struct fsmc_nand_platform_data {
 	unsigned int		options;
 	unsigned int		width;
 	unsigned int		bank;
+
+	/* CLE, ALE offsets */
+	unsigned long           cle_off;
+	unsigned long           ale_off;
+
 	void			(*select_bank)(uint32_t bank, uint32_t busw);
 };