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

SAM4E: Various bring-up fixes. NSH now works

Browse Source
This commit is contained in:
Gregory Nutt 2014-03-12 10:59:19 -06:00
parent dfdad8c95b
commit 8e6bfea5aa
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,6 +139,7 @@ static inline void sam_supcsetup(void)
if ((getreg32(SAM_SUPC_SR) & SUPC_SR_OSCSEL) == 0)
{
uint32_t delay;
putreg32((SUPC_CR_XTALSEL|SUPR_CR_KEY), SAM_SUPC_CR);
for (delay = 0;
(getreg32(SAM_SUPC_SR) & SUPC_SR_OSCSEL) == 0 && delay < UINT32_MAX;
@ -150,7 +151,7 @@ static inline void sam_supcsetup(void)
* Name: sam_pmcwait
*
* Description:
* Wait for the specide PMC status bit to become "1"
* Wait for the specified PMC status bit to become "1"
*
****************************************************************************/
@ -215,7 +216,7 @@ static inline void sam_pmcsetup(void)
* established.
*/
regval = getreg32(SAM_PMC_MCKR);
regval = getreg32(SAM_PMC_MCKR);
regval &= ~PMC_MCKR_CSS_MASK;
regval |= PMC_MCKR_CSS_MAIN;
putreg32(regval, SAM_PMC_MCKR);
@ -228,7 +229,7 @@ static inline void sam_pmcsetup(void)
* to PLLA_MMAX.
*/
putreg32(PMC_PMMR_MASK, SAM_PMC_PMMR);
//putreg32(PMC_PMMR_MASK, SAM_PMC_PMMR);
#endif
/* Setup PLLA and wait for LOCKA */
@ -349,4 +350,3 @@ void sam_clockconfig(void)
sam_enabledefaultmaster();
}

9
arch/arm/src/sam34/sam_serial.c
View File

@ -739,8 +739,13 @@ static int up_setup(struct uart_dev_s *dev)
up_serialout(priv, SAM_UART_MR_OFFSET, regval);
/* Configure the console baud. NOTE: Oversampling by 8 is not supported.
* This may limit BAUD rates for lower USART clocks.
/* Configure the console baud:
*
* Fbaud = USART_CLOCK / (16 * divisor)
* divisor = USART_CLOCK / (16 * Fbaud)
*
* NOTE: Oversampling by 8 is not supported. This may limit BAUD rates
* for lower USART clocks.
*/
regval = (SAM_USART_CLOCK + (priv->baud << 3))/(priv->baud << 4);