diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-15 22:32:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-15 22:32:31 +0000 |
| commit | bead483344c325cdd7688d008023b4344af5951d (patch) | |
| tree | 795b4829760f8befdf877497db69c1e40ee703c4 | |
| parent | 39a4006d5a7b40effa3b236dd91e9c6f9a18934a (diff) | |
| download | nuttx-bead483344c325cdd7688d008023b4344af5951d.tar.gz nuttx-bead483344c325cdd7688d008023b4344af5951d.tar.bz2 nuttx-bead483344c325cdd7688d008023b4344af5951d.zip | |
back out part of last change
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1785 42af7a65-404d-4744-a932-0658087f49c3
| -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 c8886fae3..013b617ff 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 |