diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-06-27 04:57:32 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-12 09:28:17 -0400 |
commit | 4adb70fc1b9b545ce6221f0cc35a8fa0eab13461 (patch) | |
tree | 1e7020940c3e97876f623fa5b3e17723f5fc5cfc | |
parent | 2aca0a865722fce435034cee5a33e1726fe10a9f (diff) |
[ARM] pxa: remove boot time RTC initialisation
The RTC library code contains everything necessary to set the
system time from the RTC; for similar reasons as the previous
commit, it's far better to let the RTC library code sort this
out rather than implement something which might not be
appropriate for everyone.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-pxa/time.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index 5248abe334d2..6f91fd2d061a 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -30,11 +30,6 @@ | |||
30 | #include <asm/arch/pxa-regs.h> | 30 | #include <asm/arch/pxa-regs.h> |
31 | 31 | ||
32 | 32 | ||
33 | static inline unsigned long pxa_get_rtc_time(void) | ||
34 | { | ||
35 | return RCNR; | ||
36 | } | ||
37 | |||
38 | static int pxa_set_rtc(void) | 33 | static int pxa_set_rtc(void) |
39 | { | 34 | { |
40 | unsigned long current_time = xtime.tv_sec; | 35 | unsigned long current_time = xtime.tv_sec; |
@@ -122,10 +117,6 @@ static void __init pxa_timer_init(void) | |||
122 | 117 | ||
123 | set_rtc = pxa_set_rtc; | 118 | set_rtc = pxa_set_rtc; |
124 | 119 | ||
125 | tv.tv_nsec = 0; | ||
126 | tv.tv_sec = pxa_get_rtc_time(); | ||
127 | do_settimeofday(&tv); | ||
128 | |||
129 | OIER = 0; /* disable any timer interrupts */ | 120 | OIER = 0; /* disable any timer interrupts */ |
130 | OSSR = 0xf; /* clear status on all timers */ | 121 | OSSR = 0xf; /* clear status on all timers */ |
131 | setup_irq(IRQ_OST0, &pxa_timer_irq); | 122 | setup_irq(IRQ_OST0, &pxa_timer_irq); |