aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@linux.intel.com>2010-12-09 10:37:39 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-09 10:37:39 +0000
commit7b58005274b195331dd4d57c069347fbc7e06d6c (patch)
tree47eae4aa3f1b52a705f92946a889270f646dd2b6 /arch
parent1fff962cb0af23f837d0b87431df72373d2ac99c (diff)
downloadmrst-s0i3-test-7b58005274b195331dd4d57c069347fbc7e06d6c.tar.gz
mrst-s0i3-test-7b58005274b195331dd4d57c069347fbc7e06d6c.tar.xz
mrst-s0i3-test-7b58005274b195331dd4d57c069347fbc7e06d6c.zip
mrst/vrtc: avoid using cmos rtc ops
If we don't assign Moorestown specific wallclock init and ops function the rtc/persisent clock code will use cmos rtc for access, this will crash Moorestown in that the ioports are not present. Also in vrtc driver, should avoid using cmos access to check UIP status. Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/platform/mrst/mrst.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 0aa9f51a544..7ece498180f 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -31,6 +31,7 @@
#include <asm/apic.h>
#include <asm/io_apic.h>
#include <asm/mrst.h>
+#include <asm/mrst-vrtc.h>
#include <asm/io.h>
#include <asm/i8259.h>
#include <asm/intel_scu_ipc.h>
@@ -284,6 +285,7 @@ void __init x86_mrst_early_setup(void)
x86_platform.calibrate_tsc = mrst_calibrate_tsc;
x86_platform.i8042_detect = mrst_i8042_detect;
+ x86_platform.wallclock_init = mrst_rtc_init;
x86_init.pci.init = pci_mrst_init;
x86_init.pci.fixup_irqs = x86_init_noop;