diff options
| author | Jacob Pan <jacob.jun.pan@linux.intel.com> | 2010-11-09 11:28:43 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-11-09 14:45:52 +0100 |
| commit | 7f05dec3dd70f086870fdc1d40dbe30db1fe0994 (patch) | |
| tree | 0b3ca6cddbccf7a8c04cb7b9d46bd0405060ad90 /arch | |
| parent | 1da4b1c6a4dfb5a13d7147a27c1ac53fed09befd (diff) | |
| download | linux-stable-7f05dec3dd70f086870fdc1d40dbe30db1fe0994.tar.gz linux-stable-7f05dec3dd70f086870fdc1d40dbe30db1fe0994.tar.bz2 linux-stable-7f05dec3dd70f086870fdc1d40dbe30db1fe0994.zip | |
x86: mrst: Parse SFI timer table for all timer configs
Penwell has APB timer based watchdog timers, it requires platform code to parse
SFI MTMR tables in order to claim its timer.
This patch will always parse SFI MTMR regardless of system timer configuration
choices. Otherwise, SFI MTMR table may not get parsed if running on Medfield
with always-on local APIC timers and constant TSC. Watchdog timer driver will
then not get a timer to use.
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20101109112800.20591.10802.stgit@localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/platform/mrst/mrst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c index cfa1af24edd5..e6f4473fc05b 100644 --- a/arch/x86/platform/mrst/mrst.c +++ b/arch/x86/platform/mrst/mrst.c @@ -221,6 +221,7 @@ static unsigned long __init mrst_calibrate_tsc(void) void __init mrst_time_init(void) { + sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr); switch (mrst_timer_options) { case MRST_TIMER_APBT_ONLY: break; @@ -236,7 +237,6 @@ void __init mrst_time_init(void) return; } /* we need at least one APB timer */ - sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr); pre_init_apic_IRQ0(); apbt_time_init(); } |