ARM: OMAP: Fix timer posted mode support

Currently the dmtimer posted mode is being enabled when the function
omap_dm_timer_enable_posted() is called. This function is only being called
for OMAP1 timers and OMAP2+ timers that are being used as system timers. Hence,
for OMAP2+ timers that are NOT being used as a system timer, posted mode is
not enabled but the "timer->posted" variable is still set (incorrectly) in
the omap_dm_timer_prepare() function.

This is a regression introduced by commit 3392cdd3 (ARM: OMAP: dmtimer:
switch-over to platform device driver) which was before the
omap_dm_timer_enable_posted() function was introduced. Although this is a
regression from the original code it only impacts performance and so is not
needed for stable.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Conflicts:

	arch/arm/plat-omap/dmtimer.c

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index b9349e4..fea56d5 100644 (file)
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -114,21 +114,17 @@ static void omap_dm_timer_wait_for_reset(struct omap_dm_timer *timer)
 
 static void omap_dm_timer_reset(struct omap_dm_timer *timer)
 {
-       omap_dm_timer_enable(timer);
        if (timer->pdev->id != 1) {
                omap_dm_timer_write_reg(timer, OMAP_TIMER_IF_CTRL_REG, 0x06);
                omap_dm_timer_wait_for_reset(timer);
        }
 
        __omap_dm_timer_reset(timer, 0, 0);
-       __omap_dm_timer_enable_posted(timer);
-       omap_dm_timer_disable(timer);
 }
 
 int omap_dm_timer_prepare(struct omap_dm_timer *timer)
 {
        struct dmtimer_platform_data *pdata = timer->pdev->dev.platform_data;
-       int ret;
 
        timer->fclk = clk_get(&timer->pdev->dev, "fck");
        if (WARN_ON_ONCE(IS_ERR_OR_NULL(timer->fclk))) {
@@ -137,13 +133,15 @@ int omap_dm_timer_prepare(struct omap_dm_timer *timer)
                return -EINVAL;
        }
 
+       omap_dm_timer_enable(timer);
+
        if (pdata->needs_manual_reset)
                omap_dm_timer_reset(timer);
 
-       ret = omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ);
+       __omap_dm_timer_enable_posted(timer);
+       omap_dm_timer_disable(timer);
 
-       timer->posted = 1;
-       return ret;
+       return omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ);
 }
 
 struct omap_dm_timer *omap_dm_timer_request(void)