diff options
| author | Richard Henderson <rth@twiddle.net> | 2013-07-14 00:49:45 +0200 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2013-11-17 01:33:16 +0100 |
| commit | 85d0b3a573d8b711ee0c96199ac24a0f3283ed68 (patch) | |
| tree | e3ccfb8221bac388dc44fcc068ab1b32f67839a3 /arch/alpha/kernel/machvec_impl.h | |
| parent | alpha: Primitive support for CPU power down. (diff) | |
| download | linux-85d0b3a573d8b711ee0c96199ac24a0f3283ed68.tar.xz linux-85d0b3a573d8b711ee0c96199ac24a0f3283ed68.zip | |
alpha: Reorganize rtc handling
Discontinue use of GENERIC_CMOS_UPDATE; rely on the RTC subsystem.
The marvel platform requires that the rtc only be touched from the
boot cpu. This had been partially implemented with hooks for
get/set_rtc_time, but read/update_persistent_clock were not handled.
Move the hooks from the machine_vec to a special rtc_class_ops struct.
We had read_persistent_clock managing the epoch against which the
rtc hw is based, but this didn't apply to get_rtc_time or set_rtc_time.
This resulted in incorrect values when hwclock(8) gets involved.
Allow the epoch to be set from the kernel command-line, overriding
the autodetection, which is doomed to fail in 2020. Further, by
implementing the rtc ioctl function, we can expose this epoch to
userland.
Elide the alarm functions that RTC_DRV_CMOS implements. This was
highly questionable on Alpha, since the interrupt is used by the
system timer.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'arch/alpha/kernel/machvec_impl.h')
| -rw-r--r-- | arch/alpha/kernel/machvec_impl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/alpha/kernel/machvec_impl.h b/arch/alpha/kernel/machvec_impl.h index 7fa62488bd16..f54bdf658cd0 100644 --- a/arch/alpha/kernel/machvec_impl.h +++ b/arch/alpha/kernel/machvec_impl.h @@ -43,10 +43,7 @@ #define CAT1(x,y) x##y #define CAT(x,y) CAT1(x,y) -#define DO_DEFAULT_RTC \ - .rtc_port = 0x70, \ - .rtc_get_time = common_get_rtc_time, \ - .rtc_set_time = common_set_rtc_time +#define DO_DEFAULT_RTC .rtc_port = 0x70 #define DO_EV4_MMU \ .max_asn = EV4_MAX_ASN, \ |