From 4e98d010989747fe9474dc75321d46ffb55d3589 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 6 Jul 2015 09:26:49 -0600 Subject: [PATCH] SAMD21: Correct some GCLK ID definitions for SERCOM --- arch/arm/src/samdl/chip/samd_sercom.h | 31 ++++++++++++++++++++------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/arch/arm/src/samdl/chip/samd_sercom.h b/arch/arm/src/samdl/chip/samd_sercom.h index 8a69e4050e8..9935dfa3b51 100644 --- a/arch/arm/src/samdl/chip/samd_sercom.h +++ b/arch/arm/src/samdl/chip/samd_sercom.h @@ -58,16 +58,31 @@ * * The baud-rate generator runs off the GCLK_SERCOMx_CORE clock (or, optionally, external * clock). + * + * These definitions must match the GCLK_CLKCTRL_ID_* values defined in samd_gclk.c. */ -#define SERCOM_GCLK_ID_SLOW 12 -#define SERCOM_GCLK_ID_CORE(n) (13+(n)) -# define SERCOM0_GCLK_ID_CORE 13 -# define SERCOM1_GCLK_ID_CORE 14 -# define SERCOM2_GCLK_ID_CORE 15 -# define SERCOM3_GCLK_ID_CORE 16 -# define SERCOM4_GCLK_ID_CORE 17 -# define SERCOM5_GCLK_ID_CORE 18 +#ifdef CONFIG_ARCH_FAMILY_SAMD20 +# define SERCOM_GCLK_ID_SLOW 12 +# define SERCOM_GCLK_ID_CORE(n) (13+(n)) +# define SERCOM0_GCLK_ID_CORE 13 +# define SERCOM1_GCLK_ID_CORE 14 +# define SERCOM2_GCLK_ID_CORE 15 +# define SERCOM3_GCLK_ID_CORE 16 +# define SERCOM4_GCLK_ID_CORE 17 +# define SERCOM5_GCLK_ID_CORE 18 +#endif + +#ifdef CONFIG_ARCH_FAMILY_SAMD21 +# define SERCOM_GCLK_ID_SLOW 19 +# define SERCOM_GCLK_ID_CORE(n) (20+(n)) +# define SERCOM0_GCLK_ID_CORE 20 +# define SERCOM1_GCLK_ID_CORE 21 +# define SERCOM2_GCLK_ID_CORE 22 +# define SERCOM3_GCLK_ID_CORE 23 +# define SERCOM4_GCLK_ID_CORE 24 +# define SERCOM5_GCLK_ID_CORE 25 +#endif /******************************************************************************************** * Public Types