android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

htcleo: some other timer fixes

Browse Source
This commit is contained in:
Markinus 2010-09-05 10:02:35 +02:00
parent 0d0931a92e
commit 34a82a1ecf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/configs/htcleo_defconfig
View File

@ -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

3
arch/arm/mach-msm/timer.c
View File

@ -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 */