diff options
author | John Stultz <johnstul@us.ibm.com> | 2010-03-03 22:57:17 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-03-12 19:14:09 -0500 |
commit | f7a56575fa4e62e94a644f72ef8c5d423c073982 (patch) | |
tree | 0995042279cfc27e4b9e11dc018edd492b0bd044 /arch/mn10300/kernel/rtc.c | |
parent | 1e871be1aa97babb467a929d6adcb1960659928b (diff) |
mn10300: Convert mn10300 to use read/update_persistent_clock
This patch converts the mn10300 architecture to use the generic
read_persistent_clock and update_persistent_clock interfaces, reducing
the amount of arch specific code we have to maintain, and allowing for
further cleanups in the future.
I have not built or tested this patch, so help from arch maintainers
would be appreciated.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1267675049-12337-3-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/mn10300/kernel/rtc.c')
-rw-r--r-- | arch/mn10300/kernel/rtc.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c index 7978470b5749..815a933aafa8 100644 --- a/arch/mn10300/kernel/rtc.c +++ b/arch/mn10300/kernel/rtc.c | |||
@@ -26,17 +26,15 @@ static long last_rtc_update; | |||
26 | /* time for RTC to update itself in ioclks */ | 26 | /* time for RTC to update itself in ioclks */ |
27 | static unsigned long mn10300_rtc_update_period; | 27 | static unsigned long mn10300_rtc_update_period; |
28 | 28 | ||
29 | /* | 29 | void read_persistent_clock(struct timespec *ts) |
30 | * read the current RTC time | ||
31 | */ | ||
32 | unsigned long __init get_initial_rtc_time(void) | ||
33 | { | 30 | { |
34 | struct rtc_time tm; | 31 | struct rtc_time tm; |
35 | 32 | ||
36 | get_rtc_time(&tm); | 33 | get_rtc_time(&tm); |
37 | 34 | ||
38 | return mktime(tm.tm_year, tm.tm_mon, tm.tm_mday, | 35 | ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday, |
39 | tm.tm_hour, tm.tm_min, tm.tm_sec); | 36 | tm.tm_hour, tm.tm_min, tm.tm_sec); |
37 | ts->tv_nsec = 0; | ||
40 | } | 38 | } |
41 | 39 | ||
42 | /* | 40 | /* |
@@ -110,24 +108,9 @@ static int set_rtc_mmss(unsigned long nowtime) | |||
110 | return retval; | 108 | return retval; |
111 | } | 109 | } |
112 | 110 | ||
113 | void check_rtc_time(void) | 111 | int update_persistent_clock(struct timespec now) |
114 | { | 112 | { |
115 | /* the RTC clock just finished ticking over again this second | 113 | return set_rtc_mms(now.tv_sec); |
116 | * - if we have an externally synchronized Linux clock, then update | ||
117 | * RTC clock accordingly every ~11 minutes. set_rtc_mmss() has to be | ||
118 | * called as close as possible to 500 ms before the new second starts. | ||
119 | */ | ||
120 | if ((time_status & STA_UNSYNC) == 0 && | ||
121 | xtime.tv_sec > last_rtc_update + 660 && | ||
122 | xtime.tv_nsec / 1000 >= 500000 - ((unsigned) TICK_SIZE) / 2 && | ||
123 | xtime.tv_nsec / 1000 <= 500000 + ((unsigned) TICK_SIZE) / 2 | ||
124 | ) { | ||
125 | if (set_rtc_mmss(xtime.tv_sec) == 0) | ||
126 | last_rtc_update = xtime.tv_sec; | ||
127 | else | ||
128 | /* do it again in 60s */ | ||
129 | last_rtc_update = xtime.tv_sec - 600; | ||
130 | } | ||
131 | } | 114 | } |
132 | 115 | ||
133 | /* | 116 | /* |