diff options
| author | Sutharsan Ramamoorthy <srmt@cypress.com> | 2011-02-01 22:45:04 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-04 13:04:23 -0800 |
| commit | 4b906e58a1f0a29ce1da4ed832cc6f17e5889772 (patch) | |
| tree | 129cf9004c01e2f1fab7e844bf42ea60ee3ed9c0 /drivers/staging/westbridge | |
| parent | 90441bebbaa70d8ba114861319d92eaaa65cb425 (diff) | |
Staging: Westbridge: added ioremap_nocache instead of phys_to_virt
This patch removes phys_to_virt() and adds ioremap_nocache() for
memory mapping the GPMC registers.
Signed-off-by: Sutharsan Ramamoorthy <srmt@cypress.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/westbridge')
| -rw-r--r-- | drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c index ad0c61db9937..ea9b733c3926 100644 --- a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c +++ b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c @@ -347,11 +347,8 @@ static int cy_as_hal_gpmc_init(void) u32 tmp32; int err; struct gpmc_timings timings; - /* - * get GPMC i/o registers base(already been i/o mapped - * in kernel, no need for separate i/o remap) - */ - gpmc_base = phys_to_virt(OMAP34XX_GPMC_BASE); + + gpmc_base = (u32)ioremap_nocache(OMAP34XX_GPMC_BASE, BLKSZ_4K); DBGPRN(KERN_INFO "kernel has gpmc_base=%x , val@ the base=%x", gpmc_base, __raw_readl(gpmc_base) ); |