diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-09-01 16:42:46 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:32:15 -0400 |
commit | 5bcb9a58e6e3eda4af87193c8746d15e45f51628 (patch) | |
tree | a002040a806a115d3a2b4fece08946c90e86ec8a /arch/mips | |
parent | 330cfe016bec3cdf517a626083bcb0d7b1854744 (diff) |
Move genrtc.c's functions into <asm/rtc.h>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/kernel/genrtc.c | 64 |
2 files changed, 0 insertions, 66 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 4c09e1acafd7..0213b3496170 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile | |||
@@ -59,8 +59,6 @@ obj-$(CONFIG_PROC_FS) += proc.o | |||
59 | 59 | ||
60 | obj-$(CONFIG_64BIT) += cpu-bugs64.o | 60 | obj-$(CONFIG_64BIT) += cpu-bugs64.o |
61 | 61 | ||
62 | obj-$(CONFIG_GEN_RTC) += genrtc.o | ||
63 | |||
64 | CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi) | 62 | CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi) |
65 | CFLAGS_ioctl32.o += -Ifs/ | 63 | CFLAGS_ioctl32.o += -Ifs/ |
66 | 64 | ||
diff --git a/arch/mips/kernel/genrtc.c b/arch/mips/kernel/genrtc.c deleted file mode 100644 index 71416e7bbbaa..000000000000 --- a/arch/mips/kernel/genrtc.c +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | /* | ||
2 | * A glue layer that provides RTC read/write to drivers/char/genrtc.c driver | ||
3 | * based on MIPS internal RTC routines. It does take care locking | ||
4 | * issues so that we are SMP/Preemption safe. | ||
5 | * | ||
6 | * Copyright (C) 2004 MontaVista Software Inc. | ||
7 | * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net | ||
8 | * | ||
9 | * Please read the COPYING file for all license details. | ||
10 | */ | ||
11 | |||
12 | #include <linux/spinlock.h> | ||
13 | |||
14 | #include <asm/rtc.h> | ||
15 | #include <asm/time.h> | ||
16 | |||
17 | static DEFINE_SPINLOCK(mips_rtc_lock); | ||
18 | |||
19 | unsigned int get_rtc_time(struct rtc_time *time) | ||
20 | { | ||
21 | unsigned long nowtime; | ||
22 | |||
23 | spin_lock(&mips_rtc_lock); | ||
24 | nowtime = rtc_get_time(); | ||
25 | to_tm(nowtime, time); | ||
26 | time->tm_year -= 1900; | ||
27 | spin_unlock(&mips_rtc_lock); | ||
28 | |||
29 | return RTC_24H; | ||
30 | } | ||
31 | |||
32 | int set_rtc_time(struct rtc_time *time) | ||
33 | { | ||
34 | unsigned long nowtime; | ||
35 | int ret; | ||
36 | |||
37 | spin_lock(&mips_rtc_lock); | ||
38 | nowtime = mktime(time->tm_year+1900, time->tm_mon+1, | ||
39 | time->tm_mday, time->tm_hour, time->tm_min, | ||
40 | time->tm_sec); | ||
41 | ret = rtc_set_time(nowtime); | ||
42 | spin_unlock(&mips_rtc_lock); | ||
43 | |||
44 | return ret; | ||
45 | } | ||
46 | |||
47 | unsigned int get_rtc_ss(void) | ||
48 | { | ||
49 | struct rtc_time h; | ||
50 | |||
51 | get_rtc_time(&h); | ||
52 | return h.tm_sec; | ||
53 | } | ||
54 | |||
55 | int get_rtc_pll(struct rtc_pll_info *pll) | ||
56 | { | ||
57 | return -EINVAL; | ||
58 | } | ||
59 | |||
60 | int set_rtc_pll(struct rtc_pll_info *pll) | ||
61 | { | ||
62 | return -EINVAL; | ||
63 | } | ||
64 | |||