diff --git a/boards/common/arduino-mkr/include/periph_conf_common.h b/boards/common/arduino-mkr/include/periph_conf_common.h index c64724ca5d..c5f22f62d9 100644 --- a/boards/common/arduino-mkr/include/periph_conf_common.h +++ b/boards/common/arduino-mkr/include/periph_conf_common.h @@ -91,10 +91,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, }, @@ -105,10 +103,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, } diff --git a/boards/common/arduino-zero/include/periph_conf.h b/boards/common/arduino-zero/include/periph_conf.h index 5d6053d716..1114acadba 100644 --- a/boards/common/arduino-zero/include/periph_conf.h +++ b/boards/common/arduino-zero/include/periph_conf.h @@ -92,10 +92,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, }, @@ -106,10 +104,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, } diff --git a/boards/common/saml1x/include/periph_conf.h b/boards/common/saml1x/include/periph_conf.h index 18079ad505..ba5337606f 100644 --- a/boards/common/saml1x/include/periph_conf.h +++ b/boards/common/saml1x/include/periph_conf.h @@ -49,7 +49,6 @@ static const tc32_conf_t timer_config[] = { .mclk_mask = MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1, .gclk_id = TC0_GCLK_ID, .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER(4), .flags = TC_CTRLA_MODE_COUNT32, } }; diff --git a/boards/common/sodaq/include/cfg_timer_default.h b/boards/common/sodaq/include/cfg_timer_default.h index e71484d5b3..da9606a029 100644 --- a/boards/common/sodaq/include/cfg_timer_default.h +++ b/boards/common/sodaq/include/cfg_timer_default.h @@ -40,10 +40,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, }, @@ -54,10 +52,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, } diff --git a/boards/feather-m0/include/periph_conf.h b/boards/feather-m0/include/periph_conf.h index adaccac4fc..e5a5f65d64 100644 --- a/boards/feather-m0/include/periph_conf.h +++ b/boards/feather-m0/include/periph_conf.h @@ -86,10 +86,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, }, @@ -100,10 +98,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, } diff --git a/boards/hamilton/include/periph_conf.h b/boards/hamilton/include/periph_conf.h index 68d8881736..27a33bf37b 100644 --- a/boards/hamilton/include/periph_conf.h +++ b/boards/hamilton/include/periph_conf.h @@ -119,10 +119,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, }, @@ -133,10 +131,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, } diff --git a/boards/samd21-xpro/include/periph_conf.h b/boards/samd21-xpro/include/periph_conf.h index d761c3b7b2..8e477a186d 100644 --- a/boards/samd21-xpro/include/periph_conf.h +++ b/boards/samd21-xpro/include/periph_conf.h @@ -105,10 +105,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, }, @@ -119,10 +117,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, } diff --git a/boards/same54-xpro/include/periph_conf.h b/boards/same54-xpro/include/periph_conf.h index bb6ca0c3f0..840da19bb8 100644 --- a/boards/same54-xpro/include/periph_conf.h +++ b/boards/same54-xpro/include/periph_conf.h @@ -43,7 +43,6 @@ static const tc32_conf_t timer_config[] = { .mclk_mask = MCLK_APBAMASK_TC0 | MCLK_APBAMASK_TC1, .gclk_id = TC0_GCLK_ID, .gclk_src = SAM0_GCLK_8MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV8, .flags = TC_CTRLA_MODE_COUNT32, }, { /* Timer 1 */ @@ -53,7 +52,6 @@ static const tc32_conf_t timer_config[] = { .mclk_mask = MCLK_APBBMASK_TC2 | MCLK_APBBMASK_TC3, .gclk_id = TC2_GCLK_ID, .gclk_src = SAM0_GCLK_8MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV8, .flags = TC_CTRLA_MODE_COUNT32, } }; diff --git a/boards/saml21-xpro/include/periph_conf.h b/boards/saml21-xpro/include/periph_conf.h index c66a7d4898..b4e5cea27e 100644 --- a/boards/saml21-xpro/include/periph_conf.h +++ b/boards/saml21-xpro/include/periph_conf.h @@ -52,7 +52,6 @@ static const tc32_conf_t timer_config[] = { .mclk_mask = MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1, .gclk_id = TC0_GCLK_ID, .gclk_src = SAM0_GCLK_8MHZ, - .prescaler = TC_CTRLA_PRESCALER(3), .flags = TC_CTRLA_MODE_COUNT32, } }; diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h index 847103a57c..54807ec70d 100644 --- a/boards/samr21-xpro/include/periph_conf.h +++ b/boards/samr21-xpro/include/periph_conf.h @@ -105,10 +105,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, }, @@ -119,10 +117,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, } diff --git a/boards/samr30-xpro/include/periph_conf.h b/boards/samr30-xpro/include/periph_conf.h index 13365f10eb..4d7d6ee1e9 100644 --- a/boards/samr30-xpro/include/periph_conf.h +++ b/boards/samr30-xpro/include/periph_conf.h @@ -42,7 +42,6 @@ static const tc32_conf_t timer_config[] = { .mclk_mask = MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1, .gclk_id = TC0_GCLK_ID, .gclk_src = SAM0_GCLK_8MHZ, - .prescaler = TC_CTRLA_PRESCALER(3), .flags = TC_CTRLA_MODE_COUNT32, } }; diff --git a/boards/samr34-xpro/include/periph_conf.h b/boards/samr34-xpro/include/periph_conf.h index 04e9bf45b9..d305bc49d8 100644 --- a/boards/samr34-xpro/include/periph_conf.h +++ b/boards/samr34-xpro/include/periph_conf.h @@ -49,7 +49,6 @@ static const tc32_conf_t timer_config[] = { .mclk_mask = MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1, .gclk_id = TC0_GCLK_ID, .gclk_src = SAM0_GCLK_8MHZ, - .prescaler = TC_CTRLA_PRESCALER(3), .flags = TC_CTRLA_MODE_COUNT32, } }; diff --git a/boards/sensebox_samd21/include/periph_conf.h b/boards/sensebox_samd21/include/periph_conf.h index 73509b00ba..546119261b 100644 --- a/boards/sensebox_samd21/include/periph_conf.h +++ b/boards/sensebox_samd21/include/periph_conf.h @@ -87,10 +87,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, }, @@ -101,10 +99,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, } diff --git a/boards/serpente/include/periph_conf.h b/boards/serpente/include/periph_conf.h index 411abceb5a..7382d5d63d 100644 --- a/boards/serpente/include/periph_conf.h +++ b/boards/serpente/include/periph_conf.h @@ -86,10 +86,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, }, @@ -100,10 +98,8 @@ static const tc32_conf_t timer_config[] = { .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL .gclk_src = SAM0_GCLK_1MHZ, - .prescaler = TC_CTRLA_PRESCALER_DIV1, #else .gclk_src = SAM0_GCLK_MAIN, - .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, } diff --git a/cpu/sam0_common/include/periph_cpu_common.h b/cpu/sam0_common/include/periph_cpu_common.h index e55e2a109b..55ad086a96 100644 --- a/cpu/sam0_common/include/periph_cpu_common.h +++ b/cpu/sam0_common/include/periph_cpu_common.h @@ -339,7 +339,6 @@ typedef struct { uint16_t gclk_ctrl; /**< GCLK_CLKCTRL_ID for the Timer */ #endif uint8_t gclk_src; /**< GCLK source which supplys Timer */ - uint16_t prescaler; /**< prescaler used by the Timer */ uint16_t flags; /**< flags for CTRA, e.g. TC_CTRLA_MODE_COUNT32 */ } tc32_conf_t;