Skip to contentSkip to conversation

RTC: SWARM class device persistent clock support

PATCH New [email protected] 1 participant 1 message Aug 18, 2011

Subsystems (2)
MIPS I2C subsystem host drivers
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/3 RTC: SWARM class device persistent clock support

From: Maciej W. Rozycki <macro-6z/[email protected]>

This is a set of changes removing the SWARM platform driver for the M41T81 and "wiring" the class RTC driver.

The Xicor clock is unaffected as we have no class driver for this device.

Signed-off-by Matt Turner <[email protected]>
Signed-off-by Maciej W. Rozycki <macro-6z/[email protected]>
---
 arch/mips/sibyte/swarm/Makefile     |    3 +-
 arch/mips/sibyte/swarm/rtc_m41t81.c |  233 -----------------------------------
 arch/mips/sibyte/swarm/setup.c      |   14 --
 3 files changed, 1 insertions(+), 249 deletions(-)
 delete mode 100644 arch/mips/sibyte/swarm/rtc_m41t81.c
arch/mips/sibyte/swarm/Makefile +1 -2
index 7b45f19..8527db4 100644
@@ -1,4 +1,3 @@
-obj-y				:= platform.o setup.o rtc_xicor1241.o \
-				   rtc_m41t81.o
+obj-y				:= platform.o setup.o rtc_xicor1241.o
 
 obj-$(CONFIG_I2C_BOARDINFO)	+= swarm-i2c.o
arch/mips/sibyte/swarm/rtc_m41t81.c deleted +0 -233

233 lines not on this page · raw message

arch/mips/sibyte/swarm/setup.c +0 -14
index 41707a2..3cd0d27 100644
@@ -60,10 +60,6 @@ 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;

@@ -82,7 +78,6 @@ int swarm_be_handler(struct pt_regs *regs, int is_fixup)
 enum swarm_rtc_type {
 	RTC_NONE,
 	RTC_XICOR,
-	RTC_M41T81,
 };
 
 enum swarm_rtc_type swarm_rtc_type;

@@ -96,10 +91,6 @@ void read_persistent_clock(struct timespec *ts)
 		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);

@@ -115,9 +106,6 @@ int rtc_mips_set_time(unsigned long sec)
 	case RTC_XICOR:
 		return xicor_set_time(sec);
 
-	case RTC_M41T81:
-		return m41t81_set_time(sec);
-
 	case RTC_NONE:
 	default:
 		return -1;

@@ -140,8 +128,6 @@ void __init plat_mem_setup(void)
 
 	if (xicor_probe())
 		swarm_rtc_type = RTC_XICOR;
-	if (m41t81_probe())
-		swarm_rtc_type = RTC_M41T81;
 
 #ifdef CONFIG_VT
 	screen_info = (struct screen_info) {
Signature · 1 line
1.7.3.4