From 643a98a0a82cdbb7fe5852eb80db30d1dc0199c8 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 24 May 2015 10:27:37 -0600 Subject: [PATCH] SAML21: Fix issue with open loop operation; Add configuration options to select clock source --- arch/arm/src/samdl/sam_timerisr.c | 4 +++- arch/arm/src/samdl/saml_clockconfig.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/samdl/sam_timerisr.c b/arch/arm/src/samdl/sam_timerisr.c index 55cdd2183db..30ef6370e7b 100644 --- a/arch/arm/src/samdl/sam_timerisr.c +++ b/arch/arm/src/samdl/sam_timerisr.c @@ -61,7 +61,9 @@ * system clock ticks per second. That value is a user configurable setting * that defaults to 100 (100 ticks per second = 10 MS interval). * - * Then, for example, if the CPU clock is the the SysTick and BOARD_CPU_FREQUENCY is 48MHz and CLK_TCK is 100, then the reload value would be: + * Then, for example, if the CPU clock is the the SysTick and + * BOARD_CPU_FREQUENCY is 48MHz and CLK_TCK is 100, then the reload value + * would be: * * SYSTICK_RELOAD = (48,000,000 / 100) - 1 * = 479,999 diff --git a/arch/arm/src/samdl/saml_clockconfig.c b/arch/arm/src/samdl/saml_clockconfig.c index b428db467f0..c9bcd74572e 100644 --- a/arch/arm/src/samdl/saml_clockconfig.c +++ b/arch/arm/src/samdl/saml_clockconfig.c @@ -854,7 +854,7 @@ static inline void sam_dfll48m_config(void) OSCCTRL_DFLLCTRL_QLDIS | OSCCTRL_DFLLCTRL_BPLCKC | OSCCTRL_DFLLCTRL_WAITLOCK); -#if defined(BOARD_DFLL48M_CLOSELOOP) +#if defined(BOARD_DFLL48M_CLOSEDLOOP) control |= OSCCTRL_DFLLCTRL_MODE; /* Closed loop mode */ #elif defined(BOARD_DFLL48M_RECOVERY) control |= OSCCTRL_DFLLCTRL_USBCRM; /* USB clock recovery mode */