diff options
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/time_hpet.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/i386/kernel/time_hpet.c b/arch/i386/kernel/time_hpet.c index 23e81fcbeaea..cb1f313858e3 100644 --- a/arch/i386/kernel/time_hpet.c +++ b/arch/i386/kernel/time_hpet.c | |||
@@ -309,7 +309,8 @@ int hpet_rtc_timer_init(void) | |||
309 | local_irq_restore(flags); | 309 | local_irq_restore(flags); |
310 | 310 | ||
311 | cfg = hpet_readl(HPET_T1_CFG); | 311 | cfg = hpet_readl(HPET_T1_CFG); |
312 | cfg |= HPET_TN_ENABLE | HPET_TN_SETVAL | HPET_TN_32BIT; | 312 | cfg &= ~HPET_TN_PERIODIC; |
313 | cfg |= HPET_TN_ENABLE | HPET_TN_32BIT; | ||
313 | hpet_writel(cfg, HPET_T1_CFG); | 314 | hpet_writel(cfg, HPET_T1_CFG); |
314 | 315 | ||
315 | return 1; | 316 | return 1; |
@@ -335,12 +336,6 @@ static void hpet_rtc_timer_reinit(void) | |||
335 | cnt = hpet_readl(HPET_T1_CMP); | 336 | cnt = hpet_readl(HPET_T1_CMP); |
336 | cnt += hpet_tick*HZ/hpet_rtc_int_freq; | 337 | cnt += hpet_tick*HZ/hpet_rtc_int_freq; |
337 | hpet_writel(cnt, HPET_T1_CMP); | 338 | hpet_writel(cnt, HPET_T1_CMP); |
338 | |||
339 | cfg = hpet_readl(HPET_T1_CFG); | ||
340 | cfg |= HPET_TN_ENABLE | HPET_TN_SETVAL | HPET_TN_32BIT; | ||
341 | hpet_writel(cfg, HPET_T1_CFG); | ||
342 | |||
343 | return; | ||
344 | } | 339 | } |
345 | 340 | ||
346 | /* | 341 | /* |