From: Felipe Balbi Date: Mon, 22 Sep 2008 15:10:26 +0000 (+0300) Subject: omap: ldp: fix compile breakage and physical/virtual address usage X-Git-Tag: v2.6.27-omap1~79 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c9b27237c8d9596efe0550a9e914990e943e7319;p=linux-2.6-omap-h63xx.git omap: ldp: fix compile breakage and physical/virtual address usage commit bf9454a3aaf2cad2321aa8f97bfd5d8c4ebc7bf5 broke compilation for ldp board. The following patch fixes it. Also fixes a wrong cast from a void __iomem * to u32. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 35c03b764c2..a086a95a997 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -54,9 +54,10 @@ static int __init msecure_init(void) #ifdef CONFIG_RTC_DRV_TWL4030 /* 3430ES2.0 doesn't have msecure/gpio-22 line connected to T2 */ - if (omap_device_type() == OMAP2_DEVICE_TYPE_GP && + if (omap_type() == OMAP2_DEVICE_TYPE_GP && system_rev < OMAP3430_REV_ES2_0) { - u32 msecure_pad_config_reg = omap_ctrl_base_get() + 0xA3C; + void __iomem *msecure_pad_config_reg = + omap_ctrl_base_get() + 0xA3C; int mux_mask = 0x04; u16 tmp; @@ -72,10 +73,10 @@ static int __init msecure_init(void) * TWL4030 RTC time and calender registers. */ - tmp = omap_readw(msecure_pad_config_reg); + tmp = __raw_readw(msecure_pad_config_reg); tmp &= 0xF8; /* To enable mux mode 03/04 = GPIO_RTC */ tmp |= mux_mask;/* To enable mux mode 03/04 = GPIO_RTC */ - omap_writew(tmp, msecure_pad_config_reg); + __raw_writew(tmp, msecure_pad_config_reg); gpio_direction_output(TWL4030_MSECURE_GPIO, 1); }