summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAfzal Mohammed2012-08-30 21:53:23 +0200
committerTony Lindgren2012-08-30 21:53:23 +0200
commit9222e3a7bbf3fe63629d4169b63afa27bc108ecc (patch)
treeffee0e8c8628548420528fda06d47d8ad82e8dfc
parentmtd: nand: omap2: handle nand on gpmc (diff)
downloadkernel-qcow2-linux-9222e3a7bbf3fe63629d4169b63afa27bc108ecc.tar.gz
kernel-qcow2-linux-9222e3a7bbf3fe63629d4169b63afa27bc108ecc.tar.xz
kernel-qcow2-linux-9222e3a7bbf3fe63629d4169b63afa27bc108ecc.zip
ARM: OMAP2+: gpmc-nand: update resource with memory
Currently omap nand driver uses a field in platform data - phys_base for passing the address space allocated by gpmc for nand. Use struct resource instead. With this change omap nand driver has to get address space from memory resource. This helps in smooth migration of gpmc to driver. Signed-off-by: Afzal Mohammed <afzal@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/gpmc-nand.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index d4e803cf549f..c0320d2eb40f 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -90,12 +90,14 @@ int __init gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data)
gpmc_nand_device.dev.platform_data = gpmc_nand_data;
err = gpmc_cs_request(gpmc_nand_data->cs, NAND_IO_SIZE,
- &gpmc_nand_data->phys_base);
+ (unsigned long *)&gpmc_nand_resource.start);
if (err < 0) {
dev_err(dev, "Cannot request GPMC CS\n");
return err;
}
+ gpmc_nand_resource.end = gpmc_nand_resource.start + NAND_IO_SIZE - 1;
+
/* Set timings in GPMC */
err = omap2_nand_gpmc_retime(gpmc_nand_data);
if (err < 0) {