Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cpu/sam0: unified rtt configuration #14303

Merged
merged 6 commits into from
Jun 19, 2020
Merged

cpu/sam0: unified rtt configuration #14303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eefb3fa
cpu/samd21: add unified rtt configuration
fjmolinas Jun 17, 2020
bcfe4ba
cpu/saml1x: add unified rtt configuration
fjmolinas Jun 17, 2020
f41b43e
cpu/saml21: add unified rtt configuration
fjmolinas Jun 17, 2020
36baec4
cpu/samd5x: add unified rtt configuration
fjmolinas Jun 17, 2020
15bbd95
cpu/sam0_common/rtt: add configurable RTT_FREQUENCY
fjmolinas Jun 17, 2020
ff24aa6
cpu/sam0_common/periph/rtt: uncrustify
fjmolinas Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions boards/common/arduino-mkr/include/periph_conf_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,24 +189,13 @@ static const i2c_conf_t i2c_config[] = {
#define I2C_NUMOF ARRAY_SIZE(i2c_config)
/** @} */

/**
* @name RTC configuration
* @{
*/
#define RTC_DEV RTC->MODE2
/** @} */

/**
* @name RTT configuration
* @{
*/
#define RTT_DEV RTC->MODE0
#define RTT_IRQ RTC_IRQn
#define RTT_IRQ_PRIO 10
#define RTT_ISR isr_rtc
#define RTT_MAX_VALUE (0xffffffff)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U) /* in Hz. For changes see `rtt.c` */
#define RTT_RUNSTDBY (1) /* Keep RTT running in sleep states */
#endif
/** @} */

/**
Expand Down
15 changes: 2 additions & 13 deletions boards/common/arduino-zero/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,24 +267,13 @@ static const i2c_conf_t i2c_config[] = {
#define I2C_NUMOF ARRAY_SIZE(i2c_config)
/** @} */

/**
* @name RTC configuration
* @{
*/
#define RTC_DEV RTC->MODE2
/** @} */

/**
* @name RTT configuration
* @{
*/
#define RTT_DEV RTC->MODE0
#define RTT_IRQ RTC_IRQn
#define RTT_IRQ_PRIO 10
#define RTT_ISR isr_rtc
#define RTT_MAX_VALUE (0xffffffff)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U) /* in Hz. For changes see `rtt.c` */
#define RTT_RUNSTDBY (1) /* Keep RTT running in sleep states */
#endif
/** @} */

/**
Expand Down
3 changes: 2 additions & 1 deletion boards/common/saml1x/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,9 @@ static const i2c_conf_t i2c_config[] = {
* @name RTT configuration
* @{
*/
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U)
#define RTT_MAX_VALUE (0xffffffffU)
#endif
/** @} */

/**
Expand Down
8 changes: 2 additions & 6 deletions boards/common/sodaq/include/cfg_rtt_default.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,9 @@ extern "C" {
* @name RTT configuration
* @{
*/
#define RTT_DEV RTC->MODE0
#define RTT_IRQ RTC_IRQn
#define RTT_IRQ_PRIO 10
#define RTT_ISR isr_rtc
#define RTT_MAX_VALUE (0xffffffff)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U) /* in Hz. For changes see `rtt.c` */
#define RTT_RUNSTDBY (1) /* Keep RTT running in sleep states */
#endif
/** @} */

#ifdef __cplusplus
Expand Down
17 changes: 3 additions & 14 deletions boards/feather-m0/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,23 +248,12 @@ static const i2c_conf_t i2c_config[] = {
/** @} */

/**
* @name RTC configuration
* @name RTT configuration
* @{
*/
#define RTC_DEV RTC->MODE2
/** @} */

/**
* @name RTT configuration
* @{
*/
#define RTT_DEV RTC->MODE0
#define RTT_IRQ RTC_IRQn
#define RTT_IRQ_PRIO 10
#define RTT_ISR isr_rtc
#define RTT_MAX_VALUE (0xffffffff)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U) /* in Hz. For changes see `rtt.c` */
#define RTT_RUNSTDBY (1) /* Keep RTT running in sleep states */
#endif
/** @} */

/**
Expand Down
17 changes: 3 additions & 14 deletions boards/hamilton/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,23 +88,12 @@ extern "C" {
/** @} */

/**
* @name RTC configuration
* @name RTT configuration
* @{
*/
#define RTC_DEV RTC->MODE2
/** @} */

/**
* @name RTT configuration
* @{
*/
#define RTT_DEV RTC->MODE0
#define RTT_IRQ RTC_IRQn
#define RTT_IRQ_PRIO 10
#define RTT_ISR isr_rtc
#define RTT_MAX_VALUE (0xffffffff)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U) /* in Hz. For changes see `rtt.c` */
#define RTT_RUNSTDBY (1) /* Keep RTT running in sleep states */
#endif
/** @} */

/**
Expand Down
15 changes: 2 additions & 13 deletions boards/samd21-xpro/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,24 +316,13 @@ static const i2c_conf_t i2c_config[] = {
#define I2C_NUMOF ARRAY_SIZE(i2c_config)
/** @} */

/**
* @name RTC configuration
* @{
*/
#define RTC_DEV RTC->MODE2
/** @} */

/**
* @name RTT configuration
* @{
*/
#define RTT_DEV RTC->MODE0
#define RTT_IRQ RTC_IRQn
#define RTT_IRQ_PRIO 10
#define RTT_ISR isr_rtc
#define RTT_MAX_VALUE (0xffffffff)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U) /* in Hz. For changes see `rtt.c` */
#define RTT_RUNSTDBY (1) /* Keep RTT running in sleep states */
#endif
/** @} */

/**
Expand Down
3 changes: 2 additions & 1 deletion boards/same54-xpro/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,9 @@ static const i2c_conf_t i2c_config[] = {
* @name RTT configuration
* @{
*/
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U)
#define RTT_MAX_VALUE (0xffffffffU)
#endif
/** @} */

/**
Expand Down
3 changes: 2 additions & 1 deletion boards/saml21-xpro/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ static const i2c_conf_t i2c_config[] = {
* @name RTT configuration
* @{
*/
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U)
#define RTT_MAX_VALUE (0xffffffffU)
#endif
/** @} */

/**
Expand Down
19 changes: 4 additions & 15 deletions boards/samr21-xpro/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,24 +283,13 @@ static const i2c_conf_t i2c_config[] = {
/** @} */

/**
* @name RTC configuration
* @name RTT configuration
* @{
*/
#define RTC_DEV RTC->MODE2
/** @} */

/**
* @name RTT configuration
* @{
*/
#define RTT_DEV RTC->MODE0
#define RTT_IRQ RTC_IRQn
#define RTT_IRQ_PRIO 10
#define RTT_ISR isr_rtc
#define RTT_MAX_VALUE (0xffffffff)
#define RTT_MIN_OFFSET (10U)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U) /* in Hz. For changes see `rtt.c` */
#define RTT_RUNSTDBY (1) /* Keep RTT running in sleep states */
#endif
#define RTT_MIN_OFFSET (10U)
/** @} */

/**
Expand Down
6 changes: 4 additions & 2 deletions boards/samr30-xpro/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,12 @@ static const i2c_conf_t i2c_config[] = {
* @name RTT configuration
* @{
*/
#define RTT_FREQUENCY (32768U)
#define RTT_MAX_VALUE (0xffffffffU)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U)
#endif
/** @} */


/**
* @name ADC Configuration
* @{
Expand Down
5 changes: 3 additions & 2 deletions boards/samr34-xpro/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,9 @@ static const i2c_conf_t i2c_config[] = {
* @name RTT configuration
* @{
*/
#define RTT_FREQUENCY (32768U)
#define RTT_MAX_VALUE (0xffffffffU)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U)
#endif
/** @} */

/**
Expand Down
3 changes: 2 additions & 1 deletion boards/serpente/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,9 @@ static const i2c_conf_t i2c_config[] = {
* @name RTT configuration
* @{
*/
#define RTT_MAX_VALUE (0xffffffff)
#ifndef RTT_FREQUENCY
#define RTT_FREQUENCY (32768U) /* in Hz. For changes see `rtt.c` */
#endif
/** @} */

/**
Expand Down
30 changes: 22 additions & 8 deletions cpu/sam0_common/periph/rtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,28 @@
#define RTC_MODE0_CTRLA_COUNTSYNC (0x1ul << RTC_MODE0_CTRLA_COUNTSYNC_Pos)
#endif

#ifdef REG_RTC_MODE0_CTRLA
#define RTC_MODE0_PRESCALER \
(__builtin_ctz(2 * RTT_CLOCK_FREQUENCY / RTT_FREQUENCY) << \
RTC_MODE0_CTRLA_PRESCALER_Pos)
#else
#define RTC_MODE0_PRESCALER \
(__builtin_ctz(RTT_CLOCK_FREQUENCY / RTT_FREQUENCY) << \
RTC_MODE0_CTRL_PRESCALER_Pos)
#endif

static rtt_cb_t _overflow_cb;
static void* _overflow_arg;
static void *_overflow_arg;

static rtt_cb_t _cmp0_cb;
static void* _cmp0_arg;
static void *_cmp0_arg;

static void _wait_syncbusy(void)
{
#ifdef REG_RTC_MODE0_SYNCBUSY
while (RTC->MODE0.SYNCBUSY.reg) {}
#else
while(RTC->MODE0.STATUS.bit.SYNCBUSY) {}
while (RTC->MODE0.STATUS.bit.SYNCBUSY) {}
#endif
}

Expand All @@ -66,7 +76,8 @@ static inline void _rtt_reset(void)
static void _rtt_clock_setup(void)
{
/* Setup clock GCLK2 with OSC32K */
GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN(SAM0_GCLK_32KHZ) | GCLK_CLKCTRL_ID_RTC;
GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN(SAM0_GCLK_32KHZ) |
GCLK_CLKCTRL_ID_RTC;
while (GCLK->STATUS.bit.SYNCBUSY) {}
}
#else
Expand All @@ -88,6 +99,7 @@ static void _rtt_clock_setup(void)
#else
#error "No clock source for RTT selected. "
#endif

}
#endif /* !CPU_SAMD21 - Clock Setup */

Expand All @@ -100,15 +112,17 @@ void rtt_init(void)

/* set 32bit counting mode & enable the RTC */
#ifdef REG_RTC_MODE0_CTRLA
RTC->MODE0.CTRLA.reg = RTC_MODE0_CTRLA_MODE(0) | RTC_MODE0_CTRLA_ENABLE | RTC_MODE0_CTRLA_COUNTSYNC;
RTC->MODE0.CTRLA.reg = RTC_MODE0_CTRLA_MODE(0) | RTC_MODE0_CTRLA_ENABLE |
RTC_MODE0_CTRLA_COUNTSYNC | RTC_MODE0_PRESCALER;
#else
RTC->MODE0.CTRL.reg = RTC_MODE0_CTRL_MODE(0) | RTC_MODE0_CTRL_ENABLE;
RTC->MODE0.CTRL.reg = RTC_MODE0_CTRL_MODE(0) | RTC_MODE0_CTRL_ENABLE |
RTC_MODE0_PRESCALER;
#endif
_wait_syncbusy();

/* initially clear flag */
RTC->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_CMP0
| RTC_MODE0_INTFLAG_OVF;
| RTC_MODE0_INTFLAG_OVF;

NVIC_EnableIRQ(RTC_IRQn);

Expand Down Expand Up @@ -167,7 +181,7 @@ void rtt_set_alarm(uint32_t alarm, rtt_cb_t cb, void *arg)
_wait_syncbusy();

/* enable compare interrupt and clear flag */
RTC->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_CMP0;
RTC->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_CMP0;
RTC->MODE0.INTENSET.reg = RTC_MODE0_INTENSET_CMP0;
}

Expand Down
12 changes: 12 additions & 0 deletions cpu/samd21/include/periph_cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,18 @@ typedef enum {
*/
#define DAC_NUMOF (1)

/**
* @name Real time counter configuration
* @{
*/
#define RTT_RUNSTDBY (1) /* Keep RTT running in sleep states */

#define RTT_MAX_VALUE (0xffffffff)
#define RTT_CLOCK_FREQUENCY (32768U) /* in Hz */
#define RTT_MIN_FREQUENCY (RTT_CLOCK_FREQUENCY / 1024U) /* in Hz */
#define RTT_MAX_FREQUENCY (RTT_CLOCK_FREQUENCY) /* in Hz */
/** @} */

#ifdef __cplusplus
}
#endif
Expand Down
10 changes: 10 additions & 0 deletions cpu/samd5x/include/periph_cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@ enum {
*/
#define DAC_NUMOF (2)

/**
* @name Real time counter configuration
* @{
*/
#define RTT_MAX_VALUE (0xffffffff)
#define RTT_CLOCK_FREQUENCY (32768U) /* in Hz */
#define RTT_MIN_FREQUENCY (RTT_CLOCK_FREQUENCY / 1024U) /* in Hz */
#define RTT_MAX_FREQUENCY (RTT_CLOCK_FREQUENCY) /* in Hz */
/** @} */

#ifdef __cplusplus
}
#endif
Expand Down
10 changes: 10 additions & 0 deletions cpu/saml1x/include/periph_cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ typedef enum {
*/
#define DAC_NUMOF (1)

/**
* @name Real time counter configuration
* @{
*/
#define RTT_MAX_VALUE (0xffffffff)
#define RTT_CLOCK_FREQUENCY (32768U) /* in Hz */
#define RTT_MIN_FREQUENCY (RTT_CLOCK_FREQUENCY / 1024U) /* in Hz */
#define RTT_MAX_FREQUENCY (RTT_CLOCK_FREQUENCY) /* in Hz */
/** @} */

#ifdef __cplusplus
}
#endif
Expand Down
Loading