From 3d4c69e3b76f52ab81f3111a0505cf70159b50d5 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Wed, 10 Dec 2008 17:36:34 -0800 Subject: [PATCH] --- yaml --- r: 123740 b: refs/heads/master c: 64ce2907b1966593d3b4ce5396adb17d7348637d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/dmtimer.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 415d198c7ca6..101fccb0aa9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a94b9e5a81d7f69297bb1681c5130a185e047f57 +refs/heads/master: 64ce2907b1966593d3b4ce5396adb17d7348637d diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c index 595e3d5092c9..e4f0ce04ba92 100644 --- a/trunk/arch/arm/plat-omap/dmtimer.c +++ b/trunk/arch/arm/plat-omap/dmtimer.c @@ -549,14 +549,15 @@ void omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload, u32 l; l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG); - if (autoreload) + if (autoreload) { l |= OMAP_TIMER_CTRL_AR; - else + omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load); + } else { l &= ~OMAP_TIMER_CTRL_AR; + } l |= OMAP_TIMER_CTRL_ST; omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, load); - omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load); omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l); }