sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAM4CM: Fixes from Macs N

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-27 12:27:02 -06:00
parent f189350bdc
commit 9d9a7e3934
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/sam34/chip/sam4cm_vectors.h
View File

@ -64,7 +64,7 @@
UNUSED(SAM_IRQ_RESERVED_7) /* Vector 16+7: Reserved */ UNUSED(SAM_IRQ_RESERVED_7) /* Vector 16+7: Reserved */
VECTOR(sam_uart0, SAM_IRQ_UART0) /* Vector 16+8: Universal Asynchronous Receiver Transmitter 0 */ VECTOR(sam_uart0, SAM_IRQ_UART0) /* Vector 16+8: Universal Asynchronous Receiver Transmitter 0 */
UNUSED(SAM_IRQ_RESERVED_9) /* Vector 16+9: Reserved */ UNUSED(SAM_IRQ_RESERVED_9) /* Vector 16+9: Reserved */
//VECTOR(sam_smc, SAM_IRQ_SMC) /* Vector 16+10: Static Memory Controller */ UNUSED(SAM_IRQ_RESERVED_10) /* Vector 16+10: Unused */
VECTOR(sam_pioa, SAM_IRQ_PIOA) /* Vector 16+11: Parallel I/O Controller A */ VECTOR(sam_pioa, SAM_IRQ_PIOA) /* Vector 16+11: Parallel I/O Controller A */
VECTOR(sam_piob, SAM_IRQ_PIOB) /* Vector 16+12: Parallel I/O Controller B */ VECTOR(sam_piob, SAM_IRQ_PIOB) /* Vector 16+12: Parallel I/O Controller B */
UNUSED(SAM_IRQ_RESERVED_13) /* Vector 16+13: Reserved */ UNUSED(SAM_IRQ_RESERVED_13) /* Vector 16+13: Reserved */

16
arch/arm/src/sam34/chip/sam_pmc.h
View File

@ -414,19 +414,19 @@
/* PMC Programmable Clock Register (0,1,2) */ /* PMC Programmable Clock Register (0,1,2) */
#define PMC_PCK_CSS_SHIFT (0) /* Bits 0-2: Master Clock Source Selection */ #define PMC_PCK_CSS_SHIFT (0) /* Bits 0-2: Master Clock Source Selection */
#define PMC_PCK_CSS_MASK (7 << PMC_PCK_CSS_MASK) #define PMC_PCK_CSS_MASK (7 << PMC_PCK_CSS_SHIFT)
# define PMC_PCK_CSS_SLOW (0 << PMC_PCK_CSS_MASK) /* Slow Clock */ # define PMC_PCK_CSS_SLOW (0 << PMC_PCK_CSS_SHIFT) /* Slow Clock */
# define PMC_PCK_CSS_MAIN (1 << PMC_PCK_CSS_MASK) /* Main Clock */ # define PMC_PCK_CSS_MAIN (1 << PMC_PCK_CSS_SHIFT) /* Main Clock */
# define PMC_PCK_CSS_PLLA (2 << PMC_PCK_CSS_MASK) /* PLLA Clock */ # define PMC_PCK_CSS_PLLA (2 << PMC_PCK_CSS_SHIFT) /* PLLA Clock */
#if defined(CONFIG_ARCH_CHIP_SAM4S) #if defined(CONFIG_ARCH_CHIP_SAM4CM) || defined(CONFIG_ARCH_CHIP_SAM4S)
# define PMC_PCK_CSS_PLLB (3 << PMC_PCK_CSS_MASK) /* PLLB Clock */ # define PMC_PCK_CSS_PLLB (3 << PMC_PCK_CSS_SHIFT) /* PLLB Clock */
#elif defined(CONFIG_ARCH_CHIP_SAM3X) || defined(CONFIG_ARCH_CHIP_SAM3A) || \ #elif defined(CONFIG_ARCH_CHIP_SAM3X) || defined(CONFIG_ARCH_CHIP_SAM3A) || \
defined(CONFIG_ARCH_CHIP_SAM3U) defined(CONFIG_ARCH_CHIP_SAM3U)
# define PMC_PCK_CSS_UPLL (3 << PMC_PCK_CSS_MASK) /* UPLL Clock */ # define PMC_PCK_CSS_UPLL (3 << PMC_PCK_CSS_SHIFT) /* UPLL Clock */
#endif #endif
# define PMC_PCK_CSS_MCK (4 << PMC_PCK_CSS_MASK) /* Master Clock */ # define PMC_PCK_CSS_MCK (4 << PMC_PCK_CSS_SHIFT) /* Master Clock */
#define PMC_PCK_PRES_SHIFT (4) /* Bits 4-6: Programmable Clock Prescaler */ #define PMC_PCK_PRES_SHIFT (4) /* Bits 4-6: Programmable Clock Prescaler */
#define PMC_PCK_PRES_MASK (7 << PMC_PCK_PRES_SHIFT) #define PMC_PCK_PRES_MASK (7 << PMC_PCK_PRES_SHIFT)

10
arch/arm/src/sam34/sam_clockconfig.c
View File

@ -239,16 +239,16 @@ static inline void sam_pmcsetup(void)
//putreg32(PMC_PMMR_MASK, SAM_PMC_PMMR); //putreg32(PMC_PMMR_MASK, SAM_PMC_PMMR);
#endif #endif
/* Setup PLLA and wait for LOCKA */
putreg32(BOARD_CKGR_PLLAR, SAM_PMC_CKGR_PLLAR);
sam_pmcwait(PMC_INT_LOCKA);
#ifdef CONFIG_ARCH_CHIP_SAM4CM #ifdef CONFIG_ARCH_CHIP_SAM4CM
/* Setup PLLB and wait for LOCKB */ /* Setup PLLB and wait for LOCKB */
putreg32(BOARD_CKGR_PLLBR, SAM_PMC_CKGR_PLLBR); putreg32(BOARD_CKGR_PLLBR, SAM_PMC_CKGR_PLLBR);
sam_pmcwait(PMC_INT_LOCKB); sam_pmcwait(PMC_INT_LOCKB);
#else
/* Setup PLLA and wait for LOCKA */
putreg32(BOARD_CKGR_PLLAR, SAM_PMC_CKGR_PLLAR);
sam_pmcwait(PMC_INT_LOCKA);
#endif #endif
#ifdef CONFIG_USBDEV #ifdef CONFIG_USBDEV