summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShiraz Hashim <shiraz.hashim@st.com>2012-03-07 15:30:51 +0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-03-27 03:45:55 +0400
commitb2acc92e144336dd29e30dc5d26439355be750b6 (patch)
tree8ecb61eb7f43e30d755b09a5d5ff34299f693612
parente29ee57b1d33abf119cb332a3d8fa69c9cd39096 (diff)
downloadlinux-b2acc92e144336dd29e30dc5d26439355be750b6.tar.xz
mtd: fsmc: use ALE and CLE offsets from platform data
ALE and CLE offsets can be different on different devices. Let devices pass these offsets to the fsmc driver through platform data. Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/nand/fsmc_nand.c9
-rw-r--r--include/linux/mtd/fsmc.h5
2 files changed, 10 insertions, 4 deletions
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index abbff77fd106..4dda9bb38334 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/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/include/linux/mtd/fsmc.h b/include/linux/mtd/fsmc.h
index 6987995ad3cf..2cd655f06e05 100644
--- a/include/linux/mtd/fsmc.h
+++ b/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);
};