From: Felipe Balbi <felipe.balbi@xxxxxxxxx>
Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
---
arch/arm/plat-omap/dmtimer.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 844043a..62d1d19 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -443,7 +443,7 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
l = omap_dm_timer_read_reg(&dm_timers[i], OMAP_TIMER_CTRL_REG);
if (l & OMAP_TIMER_CTRL_ST) {
- if (((omap_readl(MOD_CONF_CTRL_1) >> (i * 2)) & 0x03) == 0)
+ if (((__raw_readl(MOD_CONF_CTRL_1) >> (i * 2)) & 0x03) == 0)
inputmask &= ~(1 << 1);
else
inputmask &= ~(1 << 2);
@@ -503,9 +503,9 @@ void omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
int n = (timer - dm_timers) << 1;
u32 l;
- l = omap_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
+ l = __raw_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
l |= source << n;
- omap_writel(l, MOD_CONF_CTRL_1);
+ __raw_writel(l, MOD_CONF_CTRL_1);
}
#else
--
1.6.0.2.307.gc427
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
