diff options
Diffstat (limited to 'arch/mips/sni')
-rw-r--r-- | arch/mips/sni/pcimt.c | 1 | ||||
-rw-r--r-- | arch/mips/sni/pcit.c | 1 | ||||
-rw-r--r-- | arch/mips/sni/rm200.c | 1 | ||||
-rw-r--r-- | arch/mips/sni/time.c | 8 |
4 files changed, 7 insertions, 4 deletions
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index 44b1ae62aa4a..25cf646329ae 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c | |||
@@ -313,7 +313,6 @@ void __init sni_pcimt_init(void) | |||
313 | { | 313 | { |
314 | sni_pcimt_detect(); | 314 | sni_pcimt_detect(); |
315 | sni_pcimt_sc_init(); | 315 | sni_pcimt_sc_init(); |
316 | board_time_init = sni_cpu_time_init; | ||
317 | ioport_resource.end = sni_io_resource.end; | 316 | ioport_resource.end = sni_io_resource.end; |
318 | #ifdef CONFIG_PCI | 317 | #ifdef CONFIG_PCI |
319 | PCIBIOS_MIN_IO = 0x9000; | 318 | PCIBIOS_MIN_IO = 0x9000; |
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c index 2480c478dcbd..3361bdd240e6 100644 --- a/arch/mips/sni/pcit.c +++ b/arch/mips/sni/pcit.c | |||
@@ -263,7 +263,6 @@ void __init sni_pcit_cplus_irq_init(void) | |||
263 | 263 | ||
264 | void __init sni_pcit_init(void) | 264 | void __init sni_pcit_init(void) |
265 | { | 265 | { |
266 | board_time_init = sni_cpu_time_init; | ||
267 | ioport_resource.end = sni_io_resource.end; | 266 | ioport_resource.end = sni_io_resource.end; |
268 | #ifdef CONFIG_PCI | 267 | #ifdef CONFIG_PCI |
269 | PCIBIOS_MIN_IO = 0x9000; | 268 | PCIBIOS_MIN_IO = 0x9000; |
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c index 28a11d8605ce..94f115c6b2e0 100644 --- a/arch/mips/sni/rm200.c +++ b/arch/mips/sni/rm200.c | |||
@@ -194,5 +194,4 @@ void __init sni_rm200_init(void) | |||
194 | { | 194 | { |
195 | set_io_port_base(SNI_PORT_BASE + 0x02000000); | 195 | set_io_port_base(SNI_PORT_BASE + 0x02000000); |
196 | ioport_resource.end += 0x02000000; | 196 | ioport_resource.end += 0x02000000; |
197 | board_time_init = sni_cpu_time_init; | ||
198 | } | 197 | } |
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c index 20028fc7757e..92452d677d8f 100644 --- a/arch/mips/sni/time.c +++ b/arch/mips/sni/time.c | |||
@@ -4,6 +4,7 @@ | |||
4 | 4 | ||
5 | #include <asm/sni.h> | 5 | #include <asm/sni.h> |
6 | #include <asm/time.h> | 6 | #include <asm/time.h> |
7 | #include <asm-generic/rtc.h> | ||
7 | 8 | ||
8 | #define SNI_CLOCK_TICK_RATE 3686400 | 9 | #define SNI_CLOCK_TICK_RATE 3686400 |
9 | #define SNI_COUNTER2_DIV 64 | 10 | #define SNI_COUNTER2_DIV 64 |
@@ -71,7 +72,7 @@ static __init unsigned long dosample(void) | |||
71 | /* | 72 | /* |
72 | * Here we need to calibrate the cycle counter to at least be close. | 73 | * Here we need to calibrate the cycle counter to at least be close. |
73 | */ | 74 | */ |
74 | __init void sni_cpu_time_init(void) | 75 | void __init plat_time_init(void) |
75 | { | 76 | { |
76 | unsigned long r4k_ticks[3]; | 77 | unsigned long r4k_ticks[3]; |
77 | unsigned long r4k_tick; | 78 | unsigned long r4k_tick; |
@@ -146,3 +147,8 @@ void __init plat_timer_setup(struct irqaction *irq) | |||
146 | break; | 147 | break; |
147 | } | 148 | } |
148 | } | 149 | } |
150 | |||
151 | unsigned long read_persistent_clock(void) | ||
152 | { | ||
153 | return -1; | ||
154 | } | ||