2 files changed, 16 insertions, 30 deletions

diff --git a/firmware/target/arm/as3525/kernel-as3525.c b/firmware/target/arm/as3525/kernel-as3525.c
index d8f0e23d30..966d3bf349 100644
--- a/firmware/target/arm/as3525/kernel-as3525.c
+++ b/firmware/target/arm/as3525/kernel-as3525.c
@@ -61,26 +61,18 @@ void INT_TIMER2(void)
 
 void tick_start(unsigned int interval_in_ms)
 {
-    int phi = 0;                            /* prescaler bits */
-    int prescale = 1;
     int cycles = KERNEL_TIMER_FREQ / 1000 * interval_in_ms;
 
-    while(cycles > 0x10000)
-    {
-        phi++;
-        prescale <<= 4;
-        cycles >>= 4;
-    }
-
-    if(prescale > 256)
-        panicf("%s : interval too big", __func__);
-
     CGU_PERI |= CGU_TIMER2_CLOCK_ENABLE;    /* enable peripheral */
     VIC_INT_ENABLE |= INTERRUPT_TIMER2;     /* enable interrupt */
 
     TIMER2_LOAD = TIMER2_BGLOAD = cycles;   /* timer period */
 
     /* /!\ bit 4 (reserved) must not be modified
-     * periodic mode, interrupt enabled, 16 bits counter */
-    TIMER2_CONTROL = (TIMER2_CONTROL & (1<<4)) | 0xe0 | (phi<<2);
+     * periodic mode, interrupt enabled, no prescale, 32 bits counter */
+    TIMER2_CONTROL = (TIMER2_CONTROL & (1<<4)) |
+                     TIMER_ENABLE |
+                     TIMER_PERIODIC |
+                     TIMER_INT_ENABLE |
+                     TIMER_32_BIT;
 }
diff --git a/firmware/timer.c b/firmware/timer.c
index e9f11b6ae7..85e50ae3ca 100644
--- a/firmware/timer.c
+++ b/firmware/timer.c
@@ -109,23 +109,17 @@ void TIMER1_ISR(void)
 
 static bool timer_set(long cycles, bool start)
 {
-#if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || CONFIG_CPU == AS3525
+#if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE)
     int phi = 0; /* bits for the prescaler */
     int prescale = 1;
 
-#if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE)
-#define PRESCALE_STEP 1
-#else /* CONFIG_CPU == AS3525 */
-#define PRESCALE_STEP 4
-#endif
-
     while (cycles > 0x10000)
     {   /* work out the smallest prescaler that makes it fit */
-#if CONFIG_CPU == SH7034 || CONFIG_CPU == AS3525
+#if CONFIG_CPU == SH7034
         phi++;
 #endif
-        prescale <<= PRESCALE_STEP;
-        cycles >>= PRESCALE_STEP;
+        prescale <<= 1;
+        cycles >>= 1;
     }
 #endif
 
@@ -178,10 +172,6 @@ static bool timer_set(long cycles, bool start)
 
     return true;
 #elif CONFIG_CPU == AS3525
-    /* XXX: 32 bits cycles could be used */
-    if (prescale > 256 || cycles > 0x10000)
-        return false;
-
     if (start)
     {
         if (pfn_unregister != NULL)
@@ -193,8 +183,12 @@ static bool timer_set(long cycles, bool start)
 
     TIMER1_LOAD = TIMER1_BGLOAD = cycles;
     /* /!\ bit 4 (reserved) must not be modified
-     * periodic mode, interrupt enabled, 16 bits counter */
-    TIMER1_CONTROL = (TIMER1_CONTROL & (1<<4)) | 0xe0 | (phi<<2);
+     * periodic mode, interrupt enabled, no prescale, 32 bits counter */
+    TIMER1_CONTROL = (TIMER2_CONTROL & (1<<4)) |
+                     TIMER_ENABLE |
+                     TIMER_PERIODIC |
+                     TIMER_INT_ENABLE |
+                     TIMER_32_BIT;
     return true;
 #elif defined CPU_COLDFIRE
     if (prescale > 4096/CPUFREQ_MAX_MULT)