diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2009-05-15 22:32:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2009-05-15 22:32:31 +0000 |
| commit | 4f03ded1ebca1d079307256dfa76f2a3acbb3036 (patch) | |
| tree | 795b4829760f8befdf877497db69c1e40ee703c4 /nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c | |
| parent | 748442d3298f1e58cc5e07c230f60dee7e7180c5 (diff) | |
back out part of last change
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@1785 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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c b/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c index c8886fae3e..013b617ff3 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c +++ b/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.c @@ -210,10 +210,9 @@ void lm3s_clockconfig(uint32 newrcc, uint32 newrcc2) if (((rcc & SYSCON_RCC_MOSCDIS) && !(newrcc & SYSCON_RCC_MOSCDIS)) || ((rcc & SYSCON_RCC_IOSCDIS) && !(newrcc & SYSCON_RCC_IOSCDIS))) { - /* Enable any selected osciallators */ + /* Enable any selected osciallators (but don't disable any yet) */ - rcc &= ~RCC_OSCMASK; - rcc |= (newrcc & RCC_OSCMASK); + rcc &= (~RCC_OSCMASK | (newrcc & RCC_OSCMASK)); putreg32(rcc, LM3S_SYSCON_RCC); /* Wait for the newly selected oscillator(s) to settle. This is tricky because |