From: Thomas Veerman <thomas@minix3.org>
Date: Tue, 8 Jan 2013 12:02:38 +0000 (+0100)
Subject: ARM: fix clock
X-Git-Tag: v3.2.1~121
X-Git-Url: http://zhaoyanbai.com/repos/%24relpath%24tabs.css?a=commitdiff_plain;h=c77228c77beaa3299c51542a0674aa9645766e9a;p=minix.git

ARM: fix clock

The GPTIMER1 clock is configured to run at 32 kHz and generate
(overflow) interrupts every 1 ms. However, the Timer Overflow Wrappping
Register (TOWR) was configured to filter every other interrupt. This
caused to the internal 'realtime' value to be off.
---

diff --git a/kernel/arch/arm/omap_timer.c b/kernel/arch/arm/omap_timer.c
index 4821d2a19..f106dc092 100644
--- a/kernel/arch/arm/omap_timer.c
+++ b/kernel/arch/arm/omap_timer.c
@@ -23,23 +23,24 @@ int omap3_register_timer_handler(const irq_handler_t handler)
 
 void omap3_timer_init(unsigned freq)
 {
+    u32_t tisr;
+
     /* Stop timer */
     mmio_clear(OMAP3_GPTIMER1_TCLR, OMAP3_TCLR_ST);
 
     /* Use 32 KHz clock source for GPTIMER1 */
     mmio_clear(OMAP3_CM_CLKSEL_WKUP, OMAP3_CLKSEL_GPT1);
 
-    /* Use 1-ms tick mode for GPTIMER1 */
+    /* Use 1-ms tick mode for GPTIMER1 TRM 16.2.4.2.1 */
     mmio_write(OMAP3_GPTIMER1_TPIR, 232000);
     mmio_write(OMAP3_GPTIMER1_TNIR, -768000);
     mmio_write(OMAP3_GPTIMER1_TLDR, 0xffffffe0);
     mmio_write(OMAP3_GPTIMER1_TCRR, 0xffffffe0);
 
-    /* Set frequency */
-    mmio_write(OMAP3_GPTIMER1_TOWR, TIMER_COUNT(freq));
-
     /* Set up overflow interrupt */
-    mmio_write(OMAP3_GPTIMER1_TISR, ~0);
+    tisr = OMAP3_TISR_MAT_IT_FLAG | OMAP3_TISR_OVF_IT_FLAG |
+	   OMAP3_TISR_TCAR_IT_FLAG;
+    mmio_write(OMAP3_GPTIMER1_TISR, tisr); /* Clear interrupt status */
     mmio_write(OMAP3_GPTIMER1_TIER, OMAP3_TIER_OVF_IT_ENA);
     omap3_irq_unmask(OMAP3_GPT1_IRQ);
 
@@ -55,8 +56,12 @@ void omap3_timer_stop()
 
 void omap3_timer_int_handler()
 {
-    /* Clear the interrupt */
-    mmio_write(OMAP3_GPTIMER1_TISR, ~0);
+    /* Clear all interrupts */
+    u32_t tisr;
+
+    tisr = OMAP3_TISR_MAT_IT_FLAG | OMAP3_TISR_OVF_IT_FLAG |
+           OMAP3_TISR_TCAR_IT_FLAG;
+    mmio_write(OMAP3_GPTIMER1_TISR, tisr);
     tsc++;
 }