summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorkishore kadiyala <kishore.kadiyala@ti.com>2010-10-01 16:35:28 -0700
committerTony Lindgren <tony@atomide.com>2010-10-01 16:35:28 -0700
commit91a0b089f8358aec866bc9c69da8b84c77beaaf3 (patch)
tree7f6f3cf2565a618c4a718dc3f6e43da8025440e5 /drivers/mmc
parent531c21ba1a298422ace28efbcdf94d5579a1b702 (diff)
downloadlinux-3.10-91a0b089f8358aec866bc9c69da8b84c77beaaf3.tar.gz
linux-3.10-91a0b089f8358aec866bc9c69da8b84c77beaaf3.tar.bz2
linux-3.10-91a0b089f8358aec866bc9c69da8b84c77beaaf3.zip
omap4 hsmmc: Register offset handling
In OMAP4, as per new PM programming model, the legacy registers which were there in OMAP3 are all shifted by 0x100 while new one's are added from offset 0 to 0x10. For OMAP4, the register offset appending of 0x100 done in devices.c currently, is moved to driver file.This change fits in for current implementation as well as once the driver undergoes hwmod adaptation. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Madhusudhan Chikkature <madhu.cr@ti.com> Cc: Adrian Hunter <adrian.hunter@nokia.com> Cc: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/omap_hsmmc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 69858e75020..dc95756fd95 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2014,6 +2014,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
if (res == NULL || irq < 0)
return -ENXIO;
+ res->start += pdata->reg_offset;
+ res->end += pdata->reg_offset;
res = request_mem_region(res->start, res->end - res->start + 1,
pdev->name);
if (res == NULL)