From 34a82a1ecf92086aa0a9ffff9733f611a97ef5ba Mon Sep 17 00:00:00 2001 From: Markinus Date: Sun, 5 Sep 2010 10:02:35 +0200 Subject: [PATCH] htcleo: some other timer fixes --- arch/arm/configs/htcleo_defconfig | 4 ++-- arch/arm/mach-msm/timer.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/htcleo_defconfig b/arch/arm/configs/htcleo_defconfig index 65a215b7..a16c9461 100644 --- a/arch/arm/configs/htcleo_defconfig +++ b/arch/arm/configs/htcleo_defconfig @@ -234,8 +234,8 @@ CONFIG_MACH_HTCLEO=y # CONFIG_MSM_DALRPC_TEST is not set # CONFIG_MSM_DALRPC is not set CONFIG_CACHE_FLUSH_RANGE_LIMIT=0x40000 -CONFIG_MSM7X00A_USE_GP_TIMER=y -# CONFIG_MSM7X00A_USE_DG_TIMER is not set +# CONFIG_MSM7X00A_USE_GP_TIMER is not set +CONFIG_MSM7X00A_USE_DG_TIMER=y # CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE_SUSPEND is not set # CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE is not set CONFIG_MSM7X00A_SLEEP_MODE_APPS_SLEEP=y diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 6063cadb..75ba6c8e 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -694,9 +694,10 @@ static void __init msm_timer_init(void) struct clock_event_device *ce = &clock->clockevent; struct clocksource *cs = &clock->clocksource; writel(0, clock->regbase + TIMER_ENABLE); - // The timer should be cleared by setting the first bit. writel(1, clock->regbase + TIMER_CLEAR); +#ifndef CONFIG_MACH_HTCLEO writel(0, clock->regbase + TIMER_COUNT_VAL); +#endif writel(~0, clock->regbase + TIMER_MATCH_VAL); while (msm_read_timer_count(clock)) ; /* wait for clock to clear */