From 67e7a14e6c0346ded2102306c1bca8ecf365c018 Mon Sep 17 00:00:00 2001 From: Bas Stottelaar Date: Tue, 10 Nov 2020 23:39:35 +0100 Subject: [PATCH 1/2] boards/efm32: update channel_numof The number of channels per timer got updated incorrectly in #15368. Only TIMER1 and higher have four channels. Without this fix, timer initialization will halt. --- boards/common/slwstk6000b/include/periph_conf.h | 2 +- boards/ikea-tradfri/include/periph_conf.h | 2 +- boards/slstk3401a/include/periph_conf.h | 2 +- boards/slstk3402a/include/periph_conf.h | 4 ++-- boards/sltb001a/include/periph_conf.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boards/common/slwstk6000b/include/periph_conf.h b/boards/common/slwstk6000b/include/periph_conf.h index 628d19778e..79ab2c8ee7 100644 --- a/boards/common/slwstk6000b/include/periph_conf.h +++ b/boards/common/slwstk6000b/include/periph_conf.h @@ -148,7 +148,7 @@ static const timer_conf_t timer_config[] = { .cmu = cmuClock_TIMER1 }, .irq = TIMER1_IRQn, - .channel_numof = 4 + .channel_numof = 3 }, { .prescaler = { diff --git a/boards/ikea-tradfri/include/periph_conf.h b/boards/ikea-tradfri/include/periph_conf.h index 16941596d0..4363398704 100644 --- a/boards/ikea-tradfri/include/periph_conf.h +++ b/boards/ikea-tradfri/include/periph_conf.h @@ -125,7 +125,7 @@ static const timer_conf_t timer_config[] = { .cmu = cmuClock_TIMER1 }, .irq = TIMER1_IRQn, - .channel_numof = 4 + .channel_numof = 3 }, { .prescaler = { diff --git a/boards/slstk3401a/include/periph_conf.h b/boards/slstk3401a/include/periph_conf.h index d2e061c230..cb3753937e 100644 --- a/boards/slstk3401a/include/periph_conf.h +++ b/boards/slstk3401a/include/periph_conf.h @@ -155,7 +155,7 @@ static const timer_conf_t timer_config[] = { .cmu = cmuClock_TIMER1 }, .irq = TIMER1_IRQn, - .channel_numof = 4 + .channel_numof = 3 }, { .prescaler = { diff --git a/boards/slstk3402a/include/periph_conf.h b/boards/slstk3402a/include/periph_conf.h index dde763fc4a..4db7ef2723 100644 --- a/boards/slstk3402a/include/periph_conf.h +++ b/boards/slstk3402a/include/periph_conf.h @@ -146,7 +146,7 @@ static const timer_conf_t timer_config[] = { .cmu = cmuClock_WTIMER1 }, .irq = WTIMER1_IRQn, - .channel_numof = 4 + .channel_numof = 3 }, { .prescaler = { @@ -158,7 +158,7 @@ static const timer_conf_t timer_config[] = { .cmu = cmuClock_TIMER1 }, .irq = TIMER1_IRQn, - .channel_numof = 4 + .channel_numof = 3 }, { .prescaler = { diff --git a/boards/sltb001a/include/periph_conf.h b/boards/sltb001a/include/periph_conf.h index e6de0d5690..f1438857de 100644 --- a/boards/sltb001a/include/periph_conf.h +++ b/boards/sltb001a/include/periph_conf.h @@ -155,7 +155,7 @@ static const timer_conf_t timer_config[] = { .cmu = cmuClock_TIMER1 }, .irq = TIMER1_IRQn, - .channel_numof = 4 + .channel_numof = 3 }, { .prescaler = { From b75446e2f8cc4c4effd81198f5f87b92b7c394df Mon Sep 17 00:00:00 2001 From: Bas Stottelaar Date: Tue, 10 Nov 2020 23:43:14 +0100 Subject: [PATCH 2/2] tests/periph_rtc: add to list of 32kHz boards --- tests/periph_timer/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/periph_timer/Makefile b/tests/periph_timer/Makefile index 99b0966bf4..9355ad1d7b 100644 --- a/tests/periph_timer/Makefile +++ b/tests/periph_timer/Makefile @@ -14,6 +14,7 @@ BOARDS_TIMER_250kHz := \ BOARDS_TIMER_32kHz := \ hifive1 \ hifive1b \ + ikea-tradfri \ %-kw41z \ openlabs-kw41z-mini \ frdm-k64f \ @@ -21,6 +22,7 @@ BOARDS_TIMER_32kHz := \ slstk3401a \ slstk3402a \ sltb001a \ + slwstk6000b-% \ slwstk6220a \ stk3600 \ stk3700 \