diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-22 11:53:31 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-22 11:53:31 -0600 |
| commit | 06dafadff3ec7480201c82672f8ba4cce6fc93b5 (patch) | |
| tree | e439b87d47d5b01e048f17cfc0836562114eed61 | |
| parent | f401d4504753f5c7e43aae2fbba86efbc6930adf (diff) | |
| download | nuttx-06dafadff3ec7480201c82672f8ba4cce6fc93b5.tar.gz nuttx-06dafadff3ec7480201c82672f8ba4cce6fc93b5.tar.bz2 nuttx-06dafadff3ec7480201c82672f8ba4cce6fc93b5.zip | |
TM4C129X: Simplify be removing unnecessary temporary variable
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tm4c129_syscontrol.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/tiva/tm4c129_syscontrol.c b/nuttx/arch/arm/src/tiva/tm4c129_syscontrol.c index 425909a4d..36b4e8020 100644 --- a/nuttx/arch/arm/src/tiva/tm4c129_syscontrol.c +++ b/nuttx/arch/arm/src/tiva/tm4c129_syscontrol.c @@ -243,16 +243,11 @@ static uint32_t tiva_vco_frequency(uint32_t pllfreq0, uint32_t pllfreq1) uint32_t tiva_clockconfig(uint32_t pllfreq0, uint32_t pllfreq1, uint32_t sysdiv) { - uint32_t oscselect; uint32_t sysclk; uint32_t regval; int32_t timeout; bool newpll; - /* Set the PLL source select to MOSC. */ - - oscselect = SYSCON_RSCLKCFG_OSCSRC_MOSC | SYSCON_RSCLKCFG_PLLSRC_MOSC; - /* Clear MOSC power down, high oscillator range setting, and no crystal * present settings. */ @@ -301,7 +296,7 @@ uint32_t tiva_clockconfig(uint32_t pllfreq0, uint32_t pllfreq1, uint32_t sysdiv) /* Set the oscillator source. */ regval = getreg32(TIVA_SYSCON_RSCLKCFG); - regval |= oscselect; + regval |= (SYSCON_RSCLKCFG_OSCSRC_MOSC | SYSCON_RSCLKCFG_PLLSRC_MOSC); putreg32(regval, TIVA_SYSCON_RSCLKCFG); /* Set the M, N and Q values provided by the pllfreq0 and pllfreq1 @@ -368,8 +363,9 @@ uint32_t tiva_clockconfig(uint32_t pllfreq0, uint32_t pllfreq1, uint32_t sysdiv) if (timeout > 0) { regval = getreg32(TIVA_SYSCON_RSCLKCFG); - regval |= SYSCON_RSCLKCFG_PSYSDIV(sysdiv - 1) | SYSCON_RSCLKCFG_USEPLL | - SYSCON_RSCLKCFG_MEMTIMU | oscselect; + regval |= SYSCON_RSCLKCFG_PSYSDIV(sysdiv - 1) | + SYSCON_RSCLKCFG_OSCSRC_MOSC | SYSCON_RSCLKCFG_PLLSRC_MOSC | + SYSCON_RSCLKCFG_USEPLL | SYSCON_RSCLKCFG_MEMTIMU; putreg32(regval, TIVA_SYSCON_RSCLKCFG); } else |