From 17c79a5b0e58e5dfa239e24d6f8610019b80d129 Mon Sep 17 00:00:00 2001 From: Thomas Bogendoerfer Date: Tue, 23 Sep 2008 00:53:20 +0200 Subject: [PATCH] --- yaml --- r: 114680 b: refs/heads/master c: 656e9503bae1dbc7b0e8c709715e5eda9ae82653 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/sgi-ip32/ip32-platform.c | 16 ++++++++++++++++ trunk/arch/mips/sgi-ip32/ip32-setup.c | 5 ----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 323921c26e46..a3cf7c821e53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1dbd82e2ff02181a7102088a9fe83e17ddbcb47 +refs/heads/master: 656e9503bae1dbc7b0e8c709715e5eda9ae82653 diff --git a/trunk/arch/mips/sgi-ip32/ip32-platform.c b/trunk/arch/mips/sgi-ip32/ip32-platform.c index 3d63721e0e80..511e9ff2acfd 100644 --- a/trunk/arch/mips/sgi-ip32/ip32-platform.c +++ b/trunk/arch/mips/sgi-ip32/ip32-platform.c @@ -90,6 +90,22 @@ static __init int sgio2btns_devinit(void) device_initcall(sgio2btns_devinit); +static struct resource sgio2_cmos_rsrc[] = { + { + .start = 0x70, + .end = 0x71, + .flags = IORESOURCE_IO + } +}; + +static __init int sgio2_cmos_devinit(void) +{ + return IS_ERR(platform_device_register_simple("rtc_cmos", -1, + sgio2_cmos_rsrc, 1)); +} + +device_initcall(sgio2_cmos_devinit); + MODULE_AUTHOR("Ralf Baechle "); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("8250 UART probe driver for SGI IP32 aka O2"); diff --git a/trunk/arch/mips/sgi-ip32/ip32-setup.c b/trunk/arch/mips/sgi-ip32/ip32-setup.c index 1024bf40bd9e..c5a5d4a31b4b 100644 --- a/trunk/arch/mips/sgi-ip32/ip32-setup.c +++ b/trunk/arch/mips/sgi-ip32/ip32-setup.c @@ -62,11 +62,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str) } #endif -unsigned long read_persistent_clock(void) -{ - return mc146818_get_cmos_time(); -} - /* An arbitrary time; this can be decreased if reliability looks good */ #define WAIT_MS 10