From: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx> Tested-by: Matt Turner <mattst88@xxxxxxxxx> Signed-off-by: Matt Turner <mattst88@xxxxxxxxx> --- arch/mips/sibyte/swarm/setup.c | 49 +-------------------------------------- 1 files changed, 2 insertions(+), 47 deletions(-) diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 41707a2..5143f68 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c @@ -56,14 +56,6 @@ extern void sb1250_setup(void); #error invalid SiByte board configuration #endif -extern int xicor_probe(void); -extern int xicor_set_time(unsigned long); -extern unsigned long xicor_get_time(void); - -extern int m41t81_probe(void); -extern int m41t81_set_time(unsigned long); -extern unsigned long m41t81_get_time(void); - const char *get_system_type(void) { return "SiByte " SIBYTE_BOARD_NAME; @@ -79,49 +71,17 @@ int swarm_be_handler(struct pt_regs *regs, int is_fixup) return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL); } -enum swarm_rtc_type { - RTC_NONE, - RTC_XICOR, - RTC_M41T81, -}; - -enum swarm_rtc_type swarm_rtc_type; - void read_persistent_clock(struct timespec *ts) { unsigned long sec; - - switch (swarm_rtc_type) { - case RTC_XICOR: - sec = xicor_get_time(); - break; - - case RTC_M41T81: - sec = m41t81_get_time(); - break; - - case RTC_NONE: - default: - sec = mktime(2000, 1, 1, 0, 0, 0); - break; - } + sec = mktime(2000, 1, 1, 0, 0, 0); ts->tv_sec = sec; ts->tv_nsec = 0; } int rtc_mips_set_time(unsigned long sec) { - switch (swarm_rtc_type) { - case RTC_XICOR: - return xicor_set_time(sec); - - case RTC_M41T81: - return m41t81_set_time(sec); - - case RTC_NONE: - default: - return -1; - } + return -1; } void __init plat_mem_setup(void) @@ -138,11 +98,6 @@ void __init plat_mem_setup(void) board_be_handler = swarm_be_handler; - if (xicor_probe()) - swarm_rtc_type = RTC_XICOR; - if (m41t81_probe()) - swarm_rtc_type = RTC_M41T81; - #ifdef CONFIG_VT screen_info = (struct screen_info) { .orig_video_page = 52, -- 1.7.3.2