Merge pull request #18527 from dylad/pr/fix_sam0_timer_stop

cpu/sam0/timer: supply all clocks before accessing any regs
RIOT-OS · Aug 30, 2022 · c9bbac8 · c9bbac8
2 parents 62c8ac3 + 950a7d5
commit c9bbac8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cpu/sam0_common/periph/timer.c b/cpu/sam0_common/periph/timer.c
@@ -146,9 +146,6 @@ int timer_init(tim_t tim, uint32_t freq, timer_cb_t cb, void *arg)
         return -1;
     }
 
-    /* make sure the timer is not running */
-    timer_stop(tim);
-
     sam0_gclk_enable(cfg->gclk_src);
 #ifdef MCLK
     GCLK->PCHCTRL[cfg->gclk_id].reg = GCLK_PCHCTRL_GEN(cfg->gclk_src) | GCLK_PCHCTRL_CHEN;
@@ -158,6 +155,9 @@ int timer_init(tim_t tim, uint32_t freq, timer_cb_t cb, void *arg)
     PM->APBCMASK.reg |= cfg->pm_mask;
 #endif
 
+    /* make sure the timer is not running */
+    timer_stop(tim);
+
     /* reset the timer */
     dev(tim)->CTRLA.bit.SWRST = 1;
     while (dev(tim)->CTRLA.bit.SWRST) {}