From c4e0ed4b7991683f6dfd25fd2905dcc43e0d371e Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 17 Jan 2020 13:51:57 +0100 Subject: [PATCH] boards: use explicit GCLK_SRC defines --- .../arduino-mkrwan1300/include/periph_conf.h | 6 ++--- boards/arduino-zero/include/periph_conf.h | 18 +++++++-------- .../common/arduino-mkr/include/periph_conf.h | 6 ++--- .../arduino-mkr/include/periph_conf_common.h | 12 +++++----- boards/common/saml1x/include/periph_conf.h | 8 +++---- boards/common/sodaq/include/cfg_spi_default.h | 2 +- .../common/sodaq/include/cfg_timer_default.h | 8 +++---- .../common/sodaq/include/cfg_usbdev_default.h | 2 +- boards/feather-m0/include/periph_conf.h | 16 +++++++------- boards/hamilton/include/periph_conf.h | 12 +++++----- boards/samd21-xpro/include/periph_conf.h | 22 +++++++++---------- boards/same54-xpro/include/periph_conf.h | 12 +++++----- boards/saml21-xpro/include/periph_conf.h | 10 ++++----- boards/samr21-xpro/include/periph_conf.h | 20 ++++++++--------- boards/samr30-xpro/include/periph_conf.h | 8 +++---- boards/samr34-xpro/include/periph_conf.h | 8 +++---- boards/sensebox_samd21/include/periph_conf.h | 20 ++++++++--------- boards/sodaq-autonomo/include/periph_conf.h | 10 ++++----- boards/sodaq-explorer/include/periph_conf.h | 10 ++++----- boards/sodaq-one/include/periph_conf.h | 8 +++---- boards/sodaq-sara-aff/include/periph_conf.h | 6 ++--- 21 files changed, 112 insertions(+), 112 deletions(-) diff --git a/boards/arduino-mkrwan1300/include/periph_conf.h b/boards/arduino-mkrwan1300/include/periph_conf.h index fc1d4d63f7c8..f973ad2289f0 100644 --- a/boards/arduino-mkrwan1300/include/periph_conf.h +++ b/boards/arduino-mkrwan1300/include/periph_conf.h @@ -48,7 +48,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_3, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { /* LoRa module */ .dev = &SERCOM4->USART, @@ -62,7 +62,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_3, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, }; @@ -88,7 +88,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_C, .miso_pad = SPI_PAD_MISO_3, .mosi_pad = SPI_PAD_MOSI_0_SCK_1, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, } }; diff --git a/boards/arduino-zero/include/periph_conf.h b/boards/arduino-zero/include/periph_conf.h index 2741971354bc..8934dc0ca33e 100644 --- a/boards/arduino-zero/include/periph_conf.h +++ b/boards/arduino-zero/include/periph_conf.h @@ -90,10 +90,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC3, .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, @@ -104,10 +104,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC4 | PM_APBCMASK_TC5, .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, @@ -140,7 +140,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_3, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM0->USART, @@ -154,7 +154,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_3, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -238,7 +238,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_D, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -257,7 +257,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 23), .sda_pin = GPIO_PIN(PA, 22), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; @@ -295,7 +295,7 @@ static const sam0_common_usb_config_t sam_usbdev_config[] = { .dp = GPIO_PIN(PA, 25), .d_mux = GPIO_MUX_G, .device = &USB->DEVICE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; /** @} */ diff --git a/boards/common/arduino-mkr/include/periph_conf.h b/boards/common/arduino-mkr/include/periph_conf.h index f65707191d57..b6da53f9a0e9 100644 --- a/boards/common/arduino-mkr/include/periph_conf.h +++ b/boards/common/arduino-mkr/include/periph_conf.h @@ -48,7 +48,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_3, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -73,7 +73,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_C, .miso_pad = SPI_PAD_MISO_3, .mosi_pad = SPI_PAD_MOSI_0_SCK_1, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM2->SPI, @@ -85,7 +85,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_C, .miso_pad = SPI_PAD_MISO_3, .mosi_pad = SPI_PAD_MOSI_0_SCK_1, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; diff --git a/boards/common/arduino-mkr/include/periph_conf_common.h b/boards/common/arduino-mkr/include/periph_conf_common.h index 97c006543ede..646aafe4456b 100644 --- a/boards/common/arduino-mkr/include/periph_conf_common.h +++ b/boards/common/arduino-mkr/include/periph_conf_common.h @@ -90,10 +90,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC3, .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, @@ -104,10 +104,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC4 | PM_APBCMASK_TC5, .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, @@ -184,7 +184,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 9), .sda_pin = GPIO_PIN(PA, 8), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; @@ -221,7 +221,7 @@ static const sam0_common_usb_config_t sam_usbdev_config[] = { .dp = GPIO_PIN(PA, 25), .d_mux = GPIO_MUX_G, .device = &USB->DEVICE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; /** @} */ diff --git a/boards/common/saml1x/include/periph_conf.h b/boards/common/saml1x/include/periph_conf.h index 4a8ae78a434d..e6e7948c8e9f 100644 --- a/boards/common/saml1x/include/periph_conf.h +++ b/boards/common/saml1x/include/periph_conf.h @@ -42,7 +42,7 @@ static const tc32_conf_t timer_config[] = { .mclk = &MCLK->APBCMASK.reg, .mclk_mask = MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1, .gclk_id = TC0_GCLK_ID, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER(4), .flags = TC_CTRLA_MODE_COUNT32, } @@ -71,7 +71,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_3, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -97,7 +97,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_D, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -115,7 +115,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 17), .sda_pin = GPIO_PIN(PA, 16), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; diff --git a/boards/common/sodaq/include/cfg_spi_default.h b/boards/common/sodaq/include/cfg_spi_default.h index 95d7788dd947..5deebd8188b9 100644 --- a/boards/common/sodaq/include/cfg_spi_default.h +++ b/boards/common/sodaq/include/cfg_spi_default.h @@ -43,7 +43,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_D, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, }; diff --git a/boards/common/sodaq/include/cfg_timer_default.h b/boards/common/sodaq/include/cfg_timer_default.h index ef277506c67e..e71484d5b31b 100644 --- a/boards/common/sodaq/include/cfg_timer_default.h +++ b/boards/common/sodaq/include/cfg_timer_default.h @@ -39,10 +39,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC3, .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, @@ -53,10 +53,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC4 | PM_APBCMASK_TC5, .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, diff --git a/boards/common/sodaq/include/cfg_usbdev_default.h b/boards/common/sodaq/include/cfg_usbdev_default.h index bdd197d6de83..08446316e4cd 100644 --- a/boards/common/sodaq/include/cfg_usbdev_default.h +++ b/boards/common/sodaq/include/cfg_usbdev_default.h @@ -38,7 +38,7 @@ static const sam0_common_usb_config_t sam_usbdev_config[] = { .dp = GPIO_PIN(PA, 25), .d_mux = GPIO_MUX_G, .device = &USB->DEVICE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; /** @} */ diff --git a/boards/feather-m0/include/periph_conf.h b/boards/feather-m0/include/periph_conf.h index ed539938da0e..32f6ddf3f3a5 100644 --- a/boards/feather-m0/include/periph_conf.h +++ b/boards/feather-m0/include/periph_conf.h @@ -85,10 +85,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC3, .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, @@ -99,10 +99,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC4 | PM_APBCMASK_TC5, .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, @@ -135,7 +135,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_3, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -219,7 +219,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_D, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -237,7 +237,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 23), .sda_pin = GPIO_PIN(PA, 22), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; @@ -274,7 +274,7 @@ static const sam0_common_usb_config_t sam_usbdev_config[] = { .dp = GPIO_PIN(PA, 25), .d_mux = GPIO_MUX_G, .device = &USB->DEVICE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; /** @} */ diff --git a/boards/hamilton/include/periph_conf.h b/boards/hamilton/include/periph_conf.h index 0b321fa629aa..4909c4bae77e 100644 --- a/boards/hamilton/include/periph_conf.h +++ b/boards/hamilton/include/periph_conf.h @@ -118,10 +118,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC3, .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, @@ -132,10 +132,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC4 | PM_APBCMASK_TC5, .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, @@ -218,7 +218,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_F, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -236,7 +236,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 17), .sda_pin = GPIO_PIN(PA, 16), .mux = GPIO_MUX_D, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; diff --git a/boards/samd21-xpro/include/periph_conf.h b/boards/samd21-xpro/include/periph_conf.h index f6488811027b..2fea8f53a25b 100644 --- a/boards/samd21-xpro/include/periph_conf.h +++ b/boards/samd21-xpro/include/periph_conf.h @@ -96,10 +96,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC3, .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, @@ -110,10 +110,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC4 | PM_APBCMASK_TC5, .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, @@ -146,7 +146,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { /* EXT1 */ .dev = &SERCOM4->USART, @@ -160,7 +160,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { /* EXT2/3 */ .dev = &SERCOM4->USART, @@ -174,7 +174,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_3, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -243,7 +243,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_D, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { /* EXT2 */ .dev = &SERCOM1->SPI, @@ -255,7 +255,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_C, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { /* EXT3 */ .dev = &SERCOM5->SPI, @@ -267,7 +267,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_D, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -285,7 +285,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 9), .sda_pin = GPIO_PIN(PA, 8), .mux = GPIO_MUX_D, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; diff --git a/boards/same54-xpro/include/periph_conf.h b/boards/same54-xpro/include/periph_conf.h index a4c3cf7ffa79..e4195e97f084 100644 --- a/boards/same54-xpro/include/periph_conf.h +++ b/boards/same54-xpro/include/periph_conf.h @@ -42,7 +42,7 @@ static const tc32_conf_t timer_config[] = { .mclk = &MCLK->APBAMASK.reg, .mclk_mask = MCLK_APBAMASK_TC0 | MCLK_APBAMASK_TC1, .gclk_id = TC0_GCLK_ID, - .gclk_src = 5, + .gclk_src = SAM0_GCLK_8MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV8, .flags = TC_CTRLA_MODE_COUNT32, }, @@ -52,7 +52,7 @@ static const tc32_conf_t timer_config[] = { .mclk = &MCLK->APBBMASK.reg, .mclk_mask = MCLK_APBBMASK_TC2 | MCLK_APBBMASK_TC3, .gclk_id = TC2_GCLK_ID, - .gclk_src = 5, + .gclk_src = SAM0_GCLK_8MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV8, .flags = TC_CTRLA_MODE_COUNT32, } @@ -86,7 +86,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -112,7 +112,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_C, .miso_pad = SPI_PAD_MISO_3, .mosi_pad = SPI_PAD_MOSI_0_SCK_1, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -131,7 +131,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PD, 9), .sda_pin = GPIO_PIN(PD, 8), .mux = GPIO_MUX_C, - .gclk_src = 6, + .gclk_src = SAM0_GCLK_48MHZ, .flags = I2C_FLAG_NONE } }; @@ -167,7 +167,7 @@ static const sam0_common_usb_config_t sam_usbdev_config[] = { .dp = GPIO_PIN(PA, 25), .d_mux = GPIO_MUX_H, .device = &USB->DEVICE, - .gclk_src = 6 + .gclk_src = SAM0_GCLK_48MHZ, } }; diff --git a/boards/saml21-xpro/include/periph_conf.h b/boards/saml21-xpro/include/periph_conf.h index 27e79215eb4e..15b66956e8e0 100644 --- a/boards/saml21-xpro/include/periph_conf.h +++ b/boards/saml21-xpro/include/periph_conf.h @@ -45,7 +45,7 @@ static const tc32_conf_t timer_config[] = { .mclk = &MCLK->APBCMASK.reg, .mclk_mask = MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1, .gclk_id = TC0_GCLK_ID, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER(4), .flags = TC_CTRLA_MODE_COUNT32, } @@ -74,7 +74,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { /* EXT1 header */ .dev = &SERCOM4->USART, @@ -88,7 +88,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -114,7 +114,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_D, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -132,7 +132,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 9), .sda_pin = GPIO_PIN(PA, 8), .mux = GPIO_MUX_D, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h index ae632ec0d5f0..705d62f19aa3 100644 --- a/boards/samr21-xpro/include/periph_conf.h +++ b/boards/samr21-xpro/include/periph_conf.h @@ -96,10 +96,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC3, .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, @@ -110,10 +110,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC4 | PM_APBCMASK_TC5, .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, @@ -146,7 +146,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM5->USART, @@ -160,7 +160,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -221,7 +221,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_F, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM5->SPI, @@ -233,7 +233,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_D, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -251,7 +251,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 17), .sda_pin = GPIO_PIN(PA, 16), .mux = GPIO_MUX_D, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; @@ -309,7 +309,7 @@ static const sam0_common_usb_config_t sam_usbdev_config[] = { .dp = GPIO_PIN(PA, 25), .d_mux = GPIO_MUX_G, .device = &USB->DEVICE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; /** @} */ diff --git a/boards/samr30-xpro/include/periph_conf.h b/boards/samr30-xpro/include/periph_conf.h index 0ac30c5a0e67..a49035f23e3b 100644 --- a/boards/samr30-xpro/include/periph_conf.h +++ b/boards/samr30-xpro/include/periph_conf.h @@ -41,7 +41,7 @@ static const tc32_conf_t timer_config[] = { .mclk = &MCLK->APBCMASK.reg, .mclk_mask = MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1, .gclk_id = TC0_GCLK_ID, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER(4), .flags = TC_CTRLA_MODE_COUNT32, } @@ -70,7 +70,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -95,7 +95,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_F, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -113,7 +113,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 17), .sda_pin = GPIO_PIN(PA, 16), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; diff --git a/boards/samr34-xpro/include/periph_conf.h b/boards/samr34-xpro/include/periph_conf.h index 989783e771a2..13cc37b5d5b8 100644 --- a/boards/samr34-xpro/include/periph_conf.h +++ b/boards/samr34-xpro/include/periph_conf.h @@ -42,7 +42,7 @@ static const tc32_conf_t timer_config[] = { .mclk = &MCLK->APBCMASK.reg, .mclk_mask = MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1, .gclk_id = TC0_GCLK_ID, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER(4), .flags = TC_CTRLA_MODE_COUNT32, } @@ -72,7 +72,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -97,7 +97,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_F, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -115,7 +115,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 17), .sda_pin = GPIO_PIN(PA, 16), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; diff --git a/boards/sensebox_samd21/include/periph_conf.h b/boards/sensebox_samd21/include/periph_conf.h index 6faae4528a8e..6886c9e35e3b 100644 --- a/boards/sensebox_samd21/include/periph_conf.h +++ b/boards/sensebox_samd21/include/periph_conf.h @@ -86,10 +86,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC3, .gclk_ctrl = GCLK_CLKCTRL_ID_TCC2_TC3, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT16, @@ -100,10 +100,10 @@ static const tc32_conf_t timer_config[] = { .pm_mask = PM_APBCMASK_TC4 | PM_APBCMASK_TC5, .gclk_ctrl = GCLK_CLKCTRL_ID_TC4_TC5, #if CLOCK_USE_PLL || CLOCK_USE_XOSC32_DFLL - .gclk_src = 1, + .gclk_src = SAM0_GCLK_1MHZ, .prescaler = TC_CTRLA_PRESCALER_DIV1, #else - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .prescaler = TC_CTRLA_PRESCALER_DIV8, #endif .flags = TC_CTRLA_MODE_COUNT32, @@ -136,7 +136,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM4->USART, @@ -150,7 +150,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -176,7 +176,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_C, .miso_pad = SPI_PAD_MISO_3, .mosi_pad = SPI_PAD_MOSI_0_SCK_1, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -193,7 +193,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 8), .sda_pin = GPIO_PIN(PA, 9), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE }, { @@ -202,7 +202,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 12), .sda_pin = GPIO_PIN(PA, 13), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; @@ -253,7 +253,7 @@ static const sam0_common_usb_config_t sam_usbdev_config[] = { .dp = GPIO_PIN(PA, 25), .d_mux = GPIO_MUX_G, .device = &USB->DEVICE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, } }; /** @} */ diff --git a/boards/sodaq-autonomo/include/periph_conf.h b/boards/sodaq-autonomo/include/periph_conf.h index f9dbdf02c6c6..edfd4cd4ce9c 100644 --- a/boards/sodaq-autonomo/include/periph_conf.h +++ b/boards/sodaq-autonomo/include/periph_conf.h @@ -52,7 +52,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM5->USART, @@ -66,7 +66,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0_RTS_2_CTS_3, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM4->USART, @@ -80,7 +80,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM1->USART, @@ -94,7 +94,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, }; @@ -189,7 +189,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 13), .sda_pin = GPIO_PIN(PA, 12), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; diff --git a/boards/sodaq-explorer/include/periph_conf.h b/boards/sodaq-explorer/include/periph_conf.h index ab498aad9328..97c50f09d954 100644 --- a/boards/sodaq-explorer/include/periph_conf.h +++ b/boards/sodaq-explorer/include/periph_conf.h @@ -48,7 +48,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0_RTS_2_CTS_3, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM4->USART, @@ -62,7 +62,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { /* Connected to RN2483 */ .dev = &SERCOM0->USART, @@ -76,7 +76,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, }; @@ -128,7 +128,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 17), .sda_pin = GPIO_PIN(PA, 16), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE, }, { @@ -137,7 +137,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 9), .sda_pin = GPIO_PIN(PA, 8), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; diff --git a/boards/sodaq-one/include/periph_conf.h b/boards/sodaq-one/include/periph_conf.h index 504d3b817527..3bdb82429dd1 100644 --- a/boards/sodaq-one/include/periph_conf.h +++ b/boards/sodaq-one/include/periph_conf.h @@ -51,7 +51,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM2->USART, @@ -65,7 +65,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, }; @@ -127,7 +127,7 @@ static const spi_conf_t spi_config[] = { .clk_mux = GPIO_MUX_C, .miso_pad = SPI_PAD_MISO_0, .mosi_pad = SPI_PAD_MOSI_2_SCK_3, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, } }; @@ -145,7 +145,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 23), .sda_pin = GPIO_PIN(PA, 22), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } }; diff --git a/boards/sodaq-sara-aff/include/periph_conf.h b/boards/sodaq-sara-aff/include/periph_conf.h index a4b0282dfeac..79643e1972fd 100644 --- a/boards/sodaq-sara-aff/include/periph_conf.h +++ b/boards/sodaq-sara-aff/include/periph_conf.h @@ -54,7 +54,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_0, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, { .dev = &SERCOM0->USART, @@ -68,7 +68,7 @@ static const uart_conf_t uart_config[] = { .rx_pad = UART_PAD_RX_1, .tx_pad = UART_PAD_TX_2, .flags = UART_FLAG_NONE, - .gclk_src = 0 + .gclk_src = SAM0_GCLK_MAIN, }, }; @@ -120,7 +120,7 @@ static const i2c_conf_t i2c_config[] = { .scl_pin = GPIO_PIN(PA, 17), .sda_pin = GPIO_PIN(PA, 16), .mux = GPIO_MUX_C, - .gclk_src = 0, + .gclk_src = SAM0_GCLK_MAIN, .flags = I2C_FLAG_NONE } };