diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2009-05-15 22:00:05 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2009-05-15 22:00:05 +0000 |
| commit | 748442d3298f1e58cc5e07c230f60dee7e7180c5 (patch) | |
| tree | 432a44c106133f7800b3ad03be9add96584699a4 /nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c | |
| parent | 88f5e87e867940b33eb040d9615b01d94faf91a9 (diff) | |
LM3S integration
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@1784 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c')
| -rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c b/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c index f44511259d..c8886fae3e 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c +++ b/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c @@ -158,7 +158,7 @@ static inline void lm3s_plllock(void) { /* Check if the PLL is locked on */ - if (getreg32(LM3S_SYSCON_RIS) & SYSCON_IMC_PLLLIM) + if ((getreg32(LM3S_SYSCON_RIS) & SYSCON_RIS_PLLLRIS) != 0) { /* Yes.. return now */ @@ -212,7 +212,8 @@ void lm3s_clockconfig(uint32 newrcc, uint32 newrcc2) { /* Enable any selected osciallators */ - rcc &= (~RCC_OSCMASK|(newrcc & RCC_OSCMASK)); + rcc &= ~RCC_OSCMASK; + rcc |= (newrcc & RCC_OSCMASK); putreg32(rcc, LM3S_SYSCON_RCC); /* Wait for the newly selected oscillator(s) to settle. This is tricky because @@ -254,7 +255,7 @@ void lm3s_clockconfig(uint32 newrcc, uint32 newrcc2) lm3s_delay(16); - /* Set the requested system deivider and disable the non-selected osciallators */ + /* Set the requested system divider and disable the non-selected osciallators */ rcc &= ~RCC_DIVMASK; rcc |= newrcc & RCC_DIVMASK; |