Skip to content

Commit

Permalink
boards: use explicit GCLK_SRC defines
Browse files Browse the repository at this point in the history
  • Loading branch information
@benpicco
benpicco committed Feb 4, 2020
1 parent 38b6ee5 commit c4e0ed4
Show file tree
Hide file tree
Showing 21 changed files with 112 additions and 112 deletions.
6 changes: 3 additions & 3 deletions boards/arduino-mkrwan1300/include/periph_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
},
};

Expand All @@ -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,
}
};

Expand Down
18 changes: 9 additions & 9 deletions boards/arduino-zero/include/periph_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
}
};

Expand Down Expand Up @@ -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,
}
};

Expand All @@ -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
}
};
Expand Down Expand Up @@ -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,
}
};
/** @} */
Expand Down
6 changes: 3 additions & 3 deletions boards/common/arduino-mkr/include/periph_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
};

Expand All @@ -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,
Expand All @@ -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,
}
};

Expand Down
12 changes: 6 additions & 6 deletions boards/common/arduino-mkr/include/periph_conf_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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
}
};
Expand Down Expand Up @@ -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,
}
};
/** @} */
Expand Down
8 changes: 4 additions & 4 deletions boards/common/saml1x/include/periph_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down Expand Up @@ -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,
}
};

Expand All @@ -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,
}
};

Expand All @@ -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
}
};
Expand Down
2 changes: 1 addition & 1 deletion boards/common/sodaq/include/cfg_spi_default.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
};

Expand Down
8 changes: 4 additions & 4 deletions boards/common/sodaq/include/cfg_timer_default.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion boards/common/sodaq/include/cfg_usbdev_default.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
};
/** @} */
Expand Down
16 changes: 8 additions & 8 deletions boards/feather-m0/include/periph_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
}
};

Expand Down Expand Up @@ -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,
}
};

Expand All @@ -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
}
};
Expand Down Expand Up @@ -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,
}
};
/** @} */
Expand Down
12 changes: 6 additions & 6 deletions boards/hamilton/include/periph_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
}
};

Expand All @@ -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
}
};
Expand Down
Loading

0 comments on commit c4e0ed4

Please sign in to comment.