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>

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 ad0c61db9937b26f8bbb3d7e818e538f38a460f7..ea9b733c3926d440231d34d9c552eb95636c39a4 100644 (file)
--- 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)
        );