aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoshinori Sato <ysato@users.sourceforge.jp>2008-10-16 01:01:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:29 -0400
commit4b6aba51fb64071e22dad7b971c73af61916a48b (patch)
treef48c0790e2c71aaca6c84299972729e5e021eb59
parentf4cfb18d7917ecb397b3497e931a2a23175709b7 (diff)
h8300: update timer handler - delete files
Delete old timer handler. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/h8300/platform/h8300h/aki3068net/Makefile1
-rw-r--r--arch/h8300/platform/h8300h/aki3068net/timer.c51
-rw-r--r--arch/h8300/platform/h8300h/generic/Makefile1
-rw-r--r--arch/h8300/platform/h8300h/generic/timer.c95
-rw-r--r--arch/h8300/platform/h8300h/h8max/Makefile1
-rw-r--r--arch/h8300/platform/h8300h/h8max/timer.c52
-rw-r--r--arch/h8300/platform/h8s/edosk2674/Makefile1
-rw-r--r--arch/h8300/platform/h8s/edosk2674/timer.c54
-rw-r--r--arch/h8300/platform/h8s/generic/Makefile1
-rw-r--r--arch/h8300/platform/h8s/generic/timer.c53
10 files changed, 0 insertions, 310 deletions
diff --git a/arch/h8300/platform/h8300h/aki3068net/Makefile b/arch/h8300/platform/h8300h/aki3068net/Makefile
index b03c328f8c70..b7ff78050b7f 100644
--- a/arch/h8300/platform/h8300h/aki3068net/Makefile
+++ b/arch/h8300/platform/h8300h/aki3068net/Makefile
@@ -3,4 +3,3 @@
3# 3#
4 4
5extra-y := crt0_ram.o 5extra-y := crt0_ram.o
6obj-y := timer.o
diff --git a/arch/h8300/platform/h8300h/aki3068net/timer.c b/arch/h8300/platform/h8300h/aki3068net/timer.c
deleted file mode 100644
index 27cd85d56128..000000000000
--- a/arch/h8300/platform/h8300h/aki3068net/timer.c
+++ /dev/null
@@ -1,51 +0,0 @@
1/*
2 * linux/arch/h8300/platform/h8300h/aki3068net/timer.c
3 *
4 * Yoshinori Sato <ysato@users.sourcefoge.jp>
5 *
6 * Platform depend Timer Handler
7 *
8 */
9
10#include <linux/errno.h>
11#include <linux/sched.h>
12#include <linux/kernel.h>
13#include <linux/param.h>
14#include <linux/string.h>
15#include <linux/mm.h>
16#include <linux/interrupt.h>
17#include <linux/init.h>
18#include <linux/timex.h>
19
20#include <asm/segment.h>
21#include <asm/io.h>
22#include <asm/irq.h>
23#include <asm/regs306x.h>
24
25#define CMFA 6
26
27#define CMIEA 0x40
28#define CCLR_CMA 0x08
29#define CLK_DIV8192 0x03
30
31#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */
32
33void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
34{
35 /* setup 8bit timer ch2 */
36 ctrl_outb(H8300_TIMER_FREQ / HZ, TCORA2); /* set interval */
37 ctrl_outb(0x00, _8TCSR2); /* no output */
38 request_irq(40, timer_int, 0, "timer", 0);
39 ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR2); /* start count */
40}
41
42void platform_timer_eoi(void)
43{
44 *(volatile unsigned char *)_8TCSR2 &= ~(1 << CMFA);
45}
46
47void platform_gettod(int *year, int *mon, int *day, int *hour,
48 int *min, int *sec)
49{
50 *year = *mon = *day = *hour = *min = *sec = 0;
51}
diff --git a/arch/h8300/platform/h8300h/generic/Makefile b/arch/h8300/platform/h8300h/generic/Makefile
index 32b964a9010e..2b12a170209e 100644
--- a/arch/h8300/platform/h8300h/generic/Makefile
+++ b/arch/h8300/platform/h8300h/generic/Makefile
@@ -3,4 +3,3 @@
3# 3#
4 4
5extra-y := crt0_$(MODEL).o 5extra-y := crt0_$(MODEL).o
6obj-y := timer.o
diff --git a/arch/h8300/platform/h8300h/generic/timer.c b/arch/h8300/platform/h8300h/generic/timer.c
deleted file mode 100644
index 6f5cefe0cceb..000000000000
--- a/arch/h8300/platform/h8300h/generic/timer.c
+++ /dev/null
@@ -1,95 +0,0 @@
1/*
2 * linux/arch/h8300/platform/h8300h/generic/timer.c
3 *
4 * Yoshinori Sato <ysato@users.sourceforge.jp>
5 *
6 * Platform depend Timer Handler
7 *
8 */
9
10#include <linux/errno.h>
11#include <linux/sched.h>
12#include <linux/kernel.h>
13#include <linux/param.h>
14#include <linux/string.h>
15#include <linux/mm.h>
16#include <linux/interrupt.h>
17
18#include <asm/segment.h>
19#include <asm/io.h>
20#include <asm/irq.h>
21
22#include <linux/timex.h>
23
24#if defined(CONFIG_H83007) || defined(CONFIG_H83068)
25#include <asm/regs306x.h>
26#define CMFA 6
27
28#define CMIEA 0x40
29#define CCLR_CMA 0x08
30#define CLK_DIV8192 0x03
31
32#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */
33
34void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
35{
36 /* setup 8bit timer ch2 */
37 ctrl_outb(H8300_TIMER_FREQ / HZ, TCORA2); /* set interval */
38 ctrl_outb(0x00, _8TCSR2); /* no output */
39 request_irq(40, timer_int, 0, "timer", 0);
40 ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR2); /* start count */
41}
42
43void platform_timer_eoi(void)
44{
45 *(volatile unsigned char *)_8TCSR2 &= ~(1 << CMFA);
46}
47#endif
48
49#if defined(CONFIG_H83002) || defined(CONFIG_H83048)
50/* FIXME! */
51#define TSTR 0x00ffff60
52#define TSNC 0x00ffff61
53#define TMDR 0x00ffff62
54#define TFCR 0x00ffff63
55#define TOER 0x00ffff90
56#define TOCR 0x00ffff91
57/* ITU0 */
58#define TCR 0x00ffff64
59#define TIOR 0x00ffff65
60#define TIER 0x00ffff66
61#define TSR 0x00ffff67
62#define TCNT 0x00ffff68
63#define GRA 0x00ffff6a
64#define GRB 0x00ffff6c
65
66#define CCLR_CMGRA 0x20
67#define CLK_DIV8 0x03
68
69#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8 /* Timer input freq. */
70
71void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
72{
73 *(unsigned short *)GRA= H8300_TIMER_FREQ / HZ; /* set interval */
74 *(unsigned short *)TCNT=0; /* clear counter */
75 ctrl_outb(0x80|CCLR_CMGRA|CLK_DIV8, TCR); /* set ITU0 clock */
76 ctrl_outb(0x88, TIOR); /* no output */
77 request_irq(26, timer_int, 0, "timer", 0);
78 ctrl_outb(0xf9, TIER); /* compare match GRA interrupt */
79 ctrl_outb(ctrl_inb(TSNC) & ~0x01, TSNC); /* ITU0 async */
80 ctrl_outb(ctrl_inb(TMDR) & ~0x01, TMDR); /* ITU0 normal mode */
81 ctrl_outb(ctrl_inb(TSTR) | 0x01, TSTR); /* ITU0 Start */
82 return 0;
83}
84
85void platform_timer_eoi(void)
86{
87 ctrl_outb(ctrl_inb(TSR) & ~0x01,TSR);
88}
89#endif
90
91void platform_gettod(int *year, int *mon, int *day, int *hour,
92 int *min, int *sec)
93{
94 *year = *mon = *day = *hour = *min = *sec = 0;
95}
diff --git a/arch/h8300/platform/h8300h/h8max/Makefile b/arch/h8300/platform/h8300h/h8max/Makefile
index b03c328f8c70..b7ff78050b7f 100644
--- a/arch/h8300/platform/h8300h/h8max/Makefile
+++ b/arch/h8300/platform/h8300h/h8max/Makefile
@@ -3,4 +3,3 @@
3# 3#
4 4
5extra-y := crt0_ram.o 5extra-y := crt0_ram.o
6obj-y := timer.o
diff --git a/arch/h8300/platform/h8300h/h8max/timer.c b/arch/h8300/platform/h8300h/h8max/timer.c
deleted file mode 100644
index 85a574afe9d0..000000000000
--- a/arch/h8300/platform/h8300h/h8max/timer.c
+++ /dev/null
@@ -1,52 +0,0 @@
1/*
2 * linux/arch/h8300/platform/h8300h/h8max/timer.c
3 *
4 * Yoshinori Sato <ysato@users.sourcefoge.jp>
5 *
6 * Platform depend Timer Handler
7 *
8 */
9
10#include <linux/errno.h>
11#include <linux/sched.h>
12#include <linux/kernel.h>
13#include <linux/param.h>
14#include <linux/string.h>
15#include <linux/mm.h>
16#include <linux/interrupt.h>
17#include <linux/init.h>
18#include <linux/timex.h>
19
20#include <asm/segment.h>
21#include <asm/io.h>
22#include <asm/irq.h>
23#include <asm/regs306x.h>
24
25#define CMFA 6
26
27#define CMIEA 0x40
28#define CCLR_CMA 0x08
29#define CLK_DIV8192 0x03
30
31#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */
32
33void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
34{
35 /* setup 8bit timer ch2 */
36 ctrl_outb(H8300_TIMER_FREQ / HZ, TCORA2); /* set interval */
37 ctrl_outb(0x00, _8TCSR2); /* no output */
38 request_irq(40, timer_int, 0, "timer", 0);
39 ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR2); /* start count */
40}
41
42void platform_timer_eoi(void)
43{
44 *(volatile unsigned char *)_8TCSR2 &= ~(1 << CMFA);
45}
46
47void platform_gettod(int *year, int *mon, int *day, int *hour,
48 int *min, int *sec)
49{
50 *year = *mon = *day = *hour = *min = *sec = 0;
51}
52
diff --git a/arch/h8300/platform/h8s/edosk2674/Makefile b/arch/h8300/platform/h8s/edosk2674/Makefile
index f763654ac6fe..8e349723bb4f 100644
--- a/arch/h8300/platform/h8s/edosk2674/Makefile
+++ b/arch/h8300/platform/h8s/edosk2674/Makefile
@@ -3,4 +3,3 @@
3# 3#
4 4
5extra-y := crt0_$(MODEL).o 5extra-y := crt0_$(MODEL).o
6obj-y := timer.o
diff --git a/arch/h8300/platform/h8s/edosk2674/timer.c b/arch/h8300/platform/h8s/edosk2674/timer.c
deleted file mode 100644
index bfb1424482f4..000000000000
--- a/arch/h8300/platform/h8s/edosk2674/timer.c
+++ /dev/null
@@ -1,54 +0,0 @@
1/*
2 * linux/arch/h8300/platform/h8s/edosk2674/timer.c
3 *
4 * Yoshinori Sato <ysato@users.sourceforge.jp>
5 *
6 * Platform depend Timer Handler
7 *
8 */
9
10#include <linux/errno.h>
11#include <linux/sched.h>
12#include <linux/kernel.h>
13#include <linux/param.h>
14#include <linux/string.h>
15#include <linux/mm.h>
16#include <linux/interrupt.h>
17#include <linux/init.h>
18#include <linux/timex.h>
19
20#include <asm/segment.h>
21#include <asm/io.h>
22#include <asm/irq.h>
23#include <asm/regs267x.h>
24
25#define CMFA 6
26
27#define CMIEA 0x40
28#define CCLR_CMA 0x08
29#define CLK_DIV8192 0x03
30
31#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */
32
33void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
34{
35 /* 8bit timer module enabled */
36 ctrl_outb(ctrl_inb(MSTPCRL) & ~0x01, MSTPCRL);
37 /* setup 8bit timer ch1 */
38 ctrl_outb(H8300_TIMER_FREQ / HZ, _8TCORA1); /* set interval */
39 ctrl_outb(0x00, _8TCSR1); /* no output */
40 request_irq(76, timer_int, 0, "timer" ,0);
41 ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR1); /* start count */
42}
43
44void platform_timer_eoi(void)
45{
46 *(volatile unsigned char *)_8TCSR1 &= ~(1 << CMFA);
47}
48
49void platform_gettod(int *year, int *mon, int *day, int *hour,
50 int *min, int *sec)
51{
52/* FIXME! not RTC support */
53 *year = *mon = *day = *hour = *min = *sec = 0;
54}
diff --git a/arch/h8300/platform/h8s/generic/Makefile b/arch/h8300/platform/h8s/generic/Makefile
index 055d53a9811b..44b4685c664c 100644
--- a/arch/h8300/platform/h8s/generic/Makefile
+++ b/arch/h8300/platform/h8s/generic/Makefile
@@ -3,4 +3,3 @@
3# 3#
4 4
5extra-y = crt0_$(MODEL).o 5extra-y = crt0_$(MODEL).o
6obj-y := timer.o
diff --git a/arch/h8300/platform/h8s/generic/timer.c b/arch/h8300/platform/h8s/generic/timer.c
deleted file mode 100644
index c2211c6e79da..000000000000
--- a/arch/h8300/platform/h8s/generic/timer.c
+++ /dev/null
@@ -1,53 +0,0 @@
1/*
2 * linux/arch/h8300/platform/h8s/generic/timer.c
3 *
4 * Yoshinori Sato <ysato@users.sourceforge.jp>
5 *
6 * Platform depend Timer Handler
7 *
8 */
9
10#include <linux/errno.h>
11#include <linux/sched.h>
12#include <linux/kernel.h>
13#include <linux/param.h>
14#include <linux/string.h>
15#include <linux/mm.h>
16#include <linux/interrupt.h>
17#include <linux/init.h>
18#include <linux/timex.h>
19
20#include <asm/segment.h>
21#include <asm/io.h>
22#include <asm/irq.h>
23#include <asm/regs267x.h>
24
25#define CMFA 6
26
27#define CMIEA 0x40
28#define CCLR_CMA 0x08
29#define CLK_DIV8192 0x03
30
31#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */
32
33void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
34{
35 /* 8bit timer module enabled */
36 ctrl_outb(ctrl_inb(MSTPCRL) & ~0x01, MSTPCRL);
37 /* setup 8bit timer ch1 */
38 ctrl_outb(H8300_TIMER_FREQ / HZ, _8TCORA1); /* set interval */
39 ctrl_outb(0x00, _8TCSR1); /* no output */
40 request_irq(76, timer_int, 0, "timer" ,0);
41 ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR1); /* start count */
42}
43
44void platform_timer_eoi(void)
45{
46 *(volatile unsigned char *)_8TCSR1 &= ~(1 << CMFA);
47}
48
49void platform_gettod(int *year, int *mon, int *day, int *hour,
50 int *min, int *sec)
51{
52 *year = *mon = *day = *hour = *min = *sec = 0;
53}