aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi-ip27
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/sgi-ip27')
-rw-r--r--arch/mips/sgi-ip27/ip27-init.c3
-rw-r--r--arch/mips/sgi-ip27/ip27-timer.c6
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
index af08c41d6aa8..681b593071cb 100644
--- a/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@ -194,7 +194,6 @@ static inline void ioc3_eth_init(void)
194 ioc3->eier = 0; 194 ioc3->eier = 0;
195} 195}
196 196
197extern void ip27_time_init(void);
198extern void ip27_reboot_setup(void); 197extern void ip27_reboot_setup(void);
199 198
200void __init plat_mem_setup(void) 199void __init plat_mem_setup(void)
@@ -241,6 +240,4 @@ void __init plat_mem_setup(void)
241 per_cpu_init(); 240 per_cpu_init();
242 241
243 set_io_port_base(IO_BASE); 242 set_io_port_base(IO_BASE);
244
245 board_time_init = ip27_time_init;
246} 243}
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 31346162e9fa..9c1700e85be0 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -123,7 +123,7 @@ again:
123#include <asm/sn/sn0/hubio.h> 123#include <asm/sn/sn0/hubio.h>
124#include <asm/pci/bridge.h> 124#include <asm/pci/bridge.h>
125 125
126static __init unsigned long get_m48t35_time(void) 126unsigned long read_persistent_clock(void)
127{ 127{
128 unsigned int year, month, date, hour, min, sec; 128 unsigned int year, month, date, hour, min, sec;
129 struct m48t35_rtc *rtc; 129 struct m48t35_rtc *rtc;
@@ -205,12 +205,10 @@ static cycle_t ip27_hpt_read(void)
205 return REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT); 205 return REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT);
206} 206}
207 207
208void __init ip27_time_init(void) 208void __init plat_time_init(void)
209{ 209{
210 clocksource_mips.read = ip27_hpt_read; 210 clocksource_mips.read = ip27_hpt_read;
211 mips_hpt_frequency = CYCLES_PER_SEC; 211 mips_hpt_frequency = CYCLES_PER_SEC;
212 xtime.tv_sec = get_m48t35_time();
213 xtime.tv_nsec = 0;
214} 212}
215 213
216void __init cpu_time_init(void) 214void __init cpu_time_init(void)