diff options
author | Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 2007-10-22 06:43:15 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-22 17:09:00 -0400 |
commit | 1097c6ac33defae6cf501b7919c23faf240601f0 (patch) | |
tree | 326fdeb21a0b0b67a569e74117c63d74620a0fb2 /arch/mips/cobalt | |
parent | d04533650f64fe3367e180f3e488d92205152cd3 (diff) |
[MIPS] time: Add GT641xx timer0 clockevent driver
And make use of it for Cobalt. A few others such as the Malta could make
use of it as well.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cobalt')
-rw-r--r-- | arch/mips/cobalt/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/cobalt/setup.c | 24 | ||||
-rw-r--r-- | arch/mips/cobalt/time.c | 35 |
3 files changed, 39 insertions, 22 deletions
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile index 6b83f4ddc8fc..d73833b7c781 100644 --- a/arch/mips/cobalt/Makefile +++ b/arch/mips/cobalt/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for the Cobalt micro systems family specific parts of the kernel | 2 | # Makefile for the Cobalt micro systems family specific parts of the kernel |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o | 5 | obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o time.o |
6 | 6 | ||
7 | obj-$(CONFIG_PCI) += pci.o | 7 | obj-$(CONFIG_PCI) += pci.o |
8 | obj-$(CONFIG_EARLY_PRINTK) += console.o | 8 | obj-$(CONFIG_EARLY_PRINTK) += console.o |
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index d11bb1bc7b6b..dd23beb8604f 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c | |||
@@ -9,19 +9,17 @@ | |||
9 | * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv) | 9 | * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv) |
10 | * | 10 | * |
11 | */ | 11 | */ |
12 | #include <linux/interrupt.h> | ||
13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/interrupt.h> | ||
14 | #include <linux/io.h> | ||
15 | #include <linux/ioport.h> | ||
14 | #include <linux/pm.h> | 16 | #include <linux/pm.h> |
15 | 17 | ||
16 | #include <asm/bootinfo.h> | 18 | #include <asm/bootinfo.h> |
17 | #include <asm/time.h> | ||
18 | #include <asm/i8253.h> | ||
19 | #include <asm/io.h> | ||
20 | #include <asm/reboot.h> | 19 | #include <asm/reboot.h> |
21 | #include <asm/gt64120.h> | 20 | #include <asm/gt64120.h> |
22 | 21 | ||
23 | #include <cobalt.h> | 22 | #include <cobalt.h> |
24 | #include <irq.h> | ||
25 | 23 | ||
26 | extern void cobalt_machine_restart(char *command); | 24 | extern void cobalt_machine_restart(char *command); |
27 | extern void cobalt_machine_halt(void); | 25 | extern void cobalt_machine_halt(void); |
@@ -41,17 +39,6 @@ const char *get_system_type(void) | |||
41 | return "MIPS Cobalt"; | 39 | return "MIPS Cobalt"; |
42 | } | 40 | } |
43 | 41 | ||
44 | void __init plat_timer_setup(struct irqaction *irq) | ||
45 | { | ||
46 | /* Load timer value for HZ (TCLK is 50MHz) */ | ||
47 | GT_WRITE(GT_TC0_OFS, 50*1000*1000 / HZ); | ||
48 | |||
49 | /* Enable timer0 */ | ||
50 | GT_WRITE(GT_TC_CONTROL_OFS, GT_TC_CONTROL_ENTC0_MSK | GT_TC_CONTROL_SELTC0_MSK); | ||
51 | |||
52 | setup_irq(GT641XX_TIMER0_IRQ, irq); | ||
53 | } | ||
54 | |||
55 | /* | 42 | /* |
56 | * Cobalt doesn't have PS/2 keyboard/mouse interfaces, | 43 | * Cobalt doesn't have PS/2 keyboard/mouse interfaces, |
57 | * keyboard conntroller is never used. | 44 | * keyboard conntroller is never used. |
@@ -84,11 +71,6 @@ static struct resource cobalt_reserved_resources[] = { | |||
84 | }, | 71 | }, |
85 | }; | 72 | }; |
86 | 73 | ||
87 | void __init plat_time_init(void) | ||
88 | { | ||
89 | setup_pit_timer(); | ||
90 | } | ||
91 | |||
92 | void __init plat_mem_setup(void) | 74 | void __init plat_mem_setup(void) |
93 | { | 75 | { |
94 | int i; | 76 | int i; |
diff --git a/arch/mips/cobalt/time.c b/arch/mips/cobalt/time.c new file mode 100644 index 000000000000..fa819fccd5db --- /dev/null +++ b/arch/mips/cobalt/time.c | |||
@@ -0,0 +1,35 @@ | |||
1 | /* | ||
2 | * Cobalt time initialization. | ||
3 | * | ||
4 | * Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
19 | */ | ||
20 | #include <linux/init.h> | ||
21 | |||
22 | #include <asm/gt64120.h> | ||
23 | #include <asm/i8253.h> | ||
24 | #include <asm/time.h> | ||
25 | |||
26 | #define GT641XX_BASE_CLOCK 50000000 /* 50MHz */ | ||
27 | |||
28 | void __init plat_time_init(void) | ||
29 | { | ||
30 | setup_pit_timer(); | ||
31 | |||
32 | gt641xx_set_base_clock(GT641XX_BASE_CLOCK); | ||
33 | |||
34 | mips_timer_state = gt641xx_timer0_state; | ||
35 | } | ||