[MIPS] Fix bcm1480 compile

[powerpc.git] / arch / mips / sibyte / swarm / setup.c

diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index b614ca0..f9e6949 100644 (file)
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -70,6 +70,14 @@ const char *get_system_type(void)
        return "SiByte " SIBYTE_BOARD_NAME;
 }
 
+void __init swarm_time_init(void)
+{
+#if defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
+       /* Setup HPT */
+       sb1250_hpt_setup();
+#endif
+}
+
 void __init swarm_timer_setup(struct irqaction *irq)
 {
         /*
@@ -97,7 +105,7 @@ int swarm_be_handler(struct pt_regs *regs, int is_fixup)
        return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);
 }
 
-void __init plat_setup(void)
+void __init plat_mem_setup(void)
 {
 #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
        bcm1480_setup();
@@ -109,19 +117,20 @@ void __init plat_setup(void)
 
        panic_timeout = 5;  /* For debug.  */
 
+       board_time_init = swarm_time_init;
        board_timer_setup = swarm_timer_setup;
        board_be_handler = swarm_be_handler;
 
        if (xicor_probe()) {
                printk("swarm setup: Xicor 1241 RTC detected.\n");
-               rtc_get_time = xicor_get_time;
-               rtc_set_time = xicor_set_time;
+               rtc_mips_get_time = xicor_get_time;
+               rtc_mips_set_time = xicor_set_time;
        }
 
        if (m41t81_probe()) {
                printk("swarm setup: M41T81 RTC detected.\n");
-               rtc_get_time = m41t81_get_time;
-               rtc_set_time = m41t81_set_time;
+               rtc_mips_get_time = m41t81_get_time;
+               rtc_mips_set_time = m41t81_set_time;
        }
 
        printk("This kernel optimized for "