From 307d0d0e55c1748dd21e6edc5faec0ece34dac25 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 20 May 2015 13:00:39 -0600 Subject: [PATCH] SAML21 minor cleanup --- arch/arm/src/samdl/sam_usart.h | 2 ++ arch/arm/src/samdl/saml_clockconfig.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/samdl/sam_usart.h b/arch/arm/src/samdl/sam_usart.h index 528a15da8a4..640bb2af451 100644 --- a/arch/arm/src/samdl/sam_usart.h +++ b/arch/arm/src/samdl/sam_usart.h @@ -47,6 +47,8 @@ #include +#include "up_arch.h" + #if defined(CONFIG_ARCH_FAMILY_SAMD20) # include "chip/samd_usart.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) diff --git a/arch/arm/src/samdl/saml_clockconfig.c b/arch/arm/src/samdl/saml_clockconfig.c index f7cdd224473..843defcf659 100644 --- a/arch/arm/src/samdl/saml_clockconfig.c +++ b/arch/arm/src/samdl/saml_clockconfig.c @@ -816,9 +816,9 @@ 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_CLOSELOOP) control |= OSCCTRL_DFLLCTRL_MODE; /* Closed loop mode */ -#if defined(BOARD_DFLL48M_RECOVERY +#elif defined(BOARD_DFLL48M_RECOVERY) control |= OSCCTRL_DFLLCTRL_USBCRM; /* USB clock recovery mode */ #endif @@ -897,7 +897,6 @@ static inline void sam_dfll48m_config(void) static inline void sam_dfll48m_enable(void) { uint16_t control; - uint32_t regval; /* Enable the DFLL48M (with ONDEMAND still set to zero). */