SAMD21: Last fix to header files caused a compile problem because logic used a value which is no longer available for the SAMD21

This commit is contained in:
Gregory Nutt 2015-07-04 13:18:30 -06:00
parent 772bcb845e
commit 31476394bc

View File

@ -809,12 +809,17 @@ static inline void sam_config_gclks(void)
static inline void sam_dividers(void) static inline void sam_dividers(void)
{ {
#ifdef PM_CTRL_CFDEN
uint8_t regval; 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); putreg8(BOARD_CPU_DIVIDER, SAM_PM_CPUSEL);
#ifdef PM_CTRL_CFDEN
/* Optionally, enable failure detection */
regval = getreg8(SAM_PM_CTRL); regval = getreg8(SAM_PM_CTRL);
#ifdef BOARD_CPU_FAILDECT #ifdef BOARD_CPU_FAILDECT
regval |= PM_CTRL_CFDEN; regval |= PM_CTRL_CFDEN;
@ -822,6 +827,7 @@ static inline void sam_dividers(void)
regval &= ~PM_CTRL_CFDEN; regval &= ~PM_CTRL_CFDEN;
#endif #endif
putreg8(regval, SAM_PM_CTRL); putreg8(regval, SAM_PM_CTRL);
#endif
/* Set the APBA, B, and C dividers */ /* Set the APBA, B, and C dividers */