diff options
author | John Stultz <johnstul@us.ibm.com> | 2010-03-03 22:57:24 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-03-12 19:14:12 -0500 |
commit | cb0e996378900fa05d5c779d6bfa52d55ebc3407 (patch) | |
tree | 3eda87b69ffd4ef9760ef04975fc633cf985c0e9 /arch/blackfin/kernel/time-ts.c | |
parent | 6ffdc5774a9ef80e58db398a8307d5b2db2644ce (diff) |
blackfin: Convert blackfin to use read/update_persistent_clock
This patch converts the blackfin 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: Mike Frysinger <vapier@gentoo.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1267675049-12337-10-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/blackfin/kernel/time-ts.c')
-rw-r--r-- | arch/blackfin/kernel/time-ts.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c index 17c38c5b5b22..08dd3e83c187 100644 --- a/arch/blackfin/kernel/time-ts.c +++ b/arch/blackfin/kernel/time-ts.c | |||
@@ -348,9 +348,15 @@ static int __init bfin_clockevent_init(void) | |||
348 | return 0; | 348 | return 0; |
349 | } | 349 | } |
350 | 350 | ||
351 | void __init time_init(void) | 351 | void read_persistent_clock(struct timespec *ts) |
352 | { | 352 | { |
353 | time_t secs_since_1970 = (365 * 37 + 9) * 24 * 60 * 60; /* 1 Jan 2007 */ | 353 | time_t secs_since_1970 = (365 * 37 + 9) * 24 * 60 * 60; /* 1 Jan 2007 */ |
354 | ts->tv_sec = secs_since_1970; | ||
355 | ts->tv_nsec = 0; | ||
356 | } | ||
357 | |||
358 | void __init time_init(void) | ||
359 | { | ||
354 | 360 | ||
355 | #ifdef CONFIG_RTC_DRV_BFIN | 361 | #ifdef CONFIG_RTC_DRV_BFIN |
356 | /* [#2663] hack to filter junk RTC values that would cause | 362 | /* [#2663] hack to filter junk RTC values that would cause |
@@ -363,11 +369,6 @@ void __init time_init(void) | |||
363 | } | 369 | } |
364 | #endif | 370 | #endif |
365 | 371 | ||
366 | /* Initialize xtime. From now on, xtime is updated with timer interrupts */ | ||
367 | xtime.tv_sec = secs_since_1970; | ||
368 | xtime.tv_nsec = 0; | ||
369 | set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec); | ||
370 | |||
371 | bfin_cs_cycles_init(); | 372 | bfin_cs_cycles_init(); |
372 | bfin_cs_gptimer0_init(); | 373 | bfin_cs_gptimer0_init(); |
373 | bfin_clockevent_init(); | 374 | bfin_clockevent_init(); |