Correct SAM3S-Xplained load address, FLASH wait states, and UART1 pin configuration

This commit is contained in:
Gregory Nutt 2013-06-12 08:18:42 -06:00
parent a42a382b70
commit c0a0de6593
2 changed files with 8 additions and 3 deletions

View File

@ -102,8 +102,8 @@
static inline void sam_efcsetup(void)
{
putreg32((2 << EEFC_FMR_FWS_SHIFT), SAM_EEFC0_FMR);
putreg32((2 << EEFC_FMR_FWS_SHIFT), SAM_EEFC1_FMR);
putreg32((BOARD_FWS << EEFC_FMR_FWS_SHIFT), SAM_EEFC0_FMR);
putreg32((BOARD_FWS << EEFC_FMR_FWS_SHIFT), SAM_EEFC1_FMR);
}
/****************************************************************************
@ -215,7 +215,7 @@ static inline void sam_pmcsetup(void)
putreg32(regval, SAM_PMC_MCKR);
sam_pmcwait(PMC_INT_MCKRDY);
/* Settup PLLA and wait for LOCKA */
/* Setup PLLA and wait for LOCKA */
putreg32(BOARD_CKGR_PLLAR, SAM_PMC_CKGR_PLLAR);
sam_pmcwait(PMC_INT_LOCKA);

View File

@ -319,6 +319,11 @@ void sam_lowsetup(void)
(void)sam_configgpio(GPIO_UART0_TXD);
#endif
#ifdef CONFIG_SAM34_UART1
(void)sam_configgpio(GPIO_UART1_RXD);
(void)sam_configgpio(GPIO_UART1_TXD);
#endif
#ifdef CONFIG_SAM34_USART0
(void)sam_configgpio(GPIO_USART0_RXD);
(void)sam_configgpio(GPIO_USART0_TXD);