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/include/asm/machvec.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/include/asm/machvec.h')
| -rw-r--r-- | arch/alpha/include/asm/machvec.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/alpha/include/asm/machvec.h b/arch/alpha/include/asm/machvec.h index 4ac90167d346..75cb3641ed2f 100644 --- a/arch/alpha/include/asm/machvec.h +++ b/arch/alpha/include/asm/machvec.h @@ -33,6 +33,7 @@ struct alpha_machine_vector int nr_irqs; int rtc_port; + int rtc_boot_cpu_only; unsigned int max_asn; unsigned long max_isa_dma_address; unsigned long irq_probe_mask; @@ -95,9 +96,6 @@ struct alpha_machine_vector struct _alpha_agp_info *(*agp_info)(void); - unsigned int (*rtc_get_time)(struct rtc_time *); - int (*rtc_set_time)(struct rtc_time *); - const char *vector_name; /* NUMA information */ |