From 31476394bcf2e493de6400323401168ccd412e84 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 4 Jul 2015 13:18:30 -0600 Subject: [PATCH] SAMD21: Last fix to header files caused a compile problem because logic used a value which is no longer available for the SAMD21 --- arch/arm/src/samdl/samd_clockconfig.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/src/samdl/samd_clockconfig.c b/arch/arm/src/samdl/samd_clockconfig.c index 88483f434c8..6dc0f4c76fc 100644 --- a/arch/arm/src/samdl/samd_clockconfig.c +++ b/arch/arm/src/samdl/samd_clockconfig.c @@ -809,12 +809,17 @@ static inline void sam_config_gclks(void) static inline void sam_dividers(void) { +#ifdef PM_CTRL_CFDEN uint8_t regval; +#endif - /* Set CPU divider and, optionally, enable failure detection */ + /* Set the CPU divider using the divider value from the board.h header file */ putreg8(BOARD_CPU_DIVIDER, SAM_PM_CPUSEL); +#ifdef PM_CTRL_CFDEN + /* Optionally, enable failure detection */ + regval = getreg8(SAM_PM_CTRL); #ifdef BOARD_CPU_FAILDECT regval |= PM_CTRL_CFDEN; @@ -822,6 +827,7 @@ static inline void sam_dividers(void) regval &= ~PM_CTRL_CFDEN; #endif putreg8(regval, SAM_PM_CTRL); +#endif /* Set the APBA, B, and C dividers */