patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / h8300 / platform / h8s / generic / timer.c

diff --git a/arch/h8300/platform/h8s/generic/timer.c b/arch/h8300/platform/h8s/generic/timer.c
index 2e0ad11..633cd8e 100644 (file)
--- a/arch/h8300/platform/h8s/generic/timer.c
+++ b/arch/h8300/platform/h8s/generic/timer.c
@@ -23,18 +23,28 @@
 #include <asm/irq.h>
 #include <asm/regs267x.h>
 
-int platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
+#define CMFA 6
+
+#define CMIEA 0x40
+#define CCLR_CMA 0x08
+#define CLK_DIV8192 0x03
+
+#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */
+
+void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
 {
-       ctrl_outb(H8300_TIMER_COUNT_DATA,_8TCORA1);
-       ctrl_outb(0x00,_8TCSR1);
-       request_irq(76,timer_int,0,"timer",0);
-       ctrl_outb(0x40|0x08|0x03,_8TCR1);
-       return 0;
+       /* 8bit timer module enabled */
+       ctrl_outb(ctrl_inb(MSTPCRL) & ~0x01, MSTPCRL);
+       /* setup 8bit timer ch1 */
+       ctrl_outb(H8300_TIMER_FREQ / HZ, _8TCORA1);      /* set interval */
+       ctrl_outb(0x00, _8TCSR1);                        /* no output */
+       request_irq(76, timer_int, 0, "timer" ,0);
+       ctrl_outb(CMIEA|CCLR_CMA|CLK_DIV8192, _8TCR1);   /* start count */
 }
 
 void platform_timer_eoi(void)
 {
-        __asm__("bclr #6,@0xffffb3:8");
+       *(volatile unsigned char *)_8TCSR1 &= ~(1 << CMFA);
 }
 
 void platform_gettod(int *year, int *mon, int *day, int *hour,