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

TM4C129X: Simplify be removing unnecessary temporary variable

Browse Source
This commit is contained in:
Gregory Nutt 2014-12-22 11:53:31 -06:00
parent 3b863966fe
commit bd2d83c656
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/src/tiva/tm4c129_syscontrol.c
View File

@ -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 tiva_clockconfig(uint32_t pllfreq0, uint32_t pllfreq1, uint32_t sysdiv)
{ {
uint32_t oscselect;
uint32_t sysclk; uint32_t sysclk;
uint32_t regval; uint32_t regval;
int32_t timeout; int32_t timeout;
bool newpll; 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 /* Clear MOSC power down, high oscillator range setting, and no crystal
* present settings. * present settings.
*/ */
@ -301,7 +296,7 @@ uint32_t tiva_clockconfig(uint32_t pllfreq0, uint32_t pllfreq1, uint32_t sysdiv)
/* Set the oscillator source. */ /* Set the oscillator source. */
regval = getreg32(TIVA_SYSCON_RSCLKCFG); regval = getreg32(TIVA_SYSCON_RSCLKCFG);
regval |= oscselect; regval |= (SYSCON_RSCLKCFG_OSCSRC_MOSC | SYSCON_RSCLKCFG_PLLSRC_MOSC);
putreg32(regval, TIVA_SYSCON_RSCLKCFG); putreg32(regval, TIVA_SYSCON_RSCLKCFG);
/* Set the M, N and Q values provided by the pllfreq0 and pllfreq1 /* 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) if (timeout > 0)
{ {
regval = getreg32(TIVA_SYSCON_RSCLKCFG); regval = getreg32(TIVA_SYSCON_RSCLKCFG);
regval |= SYSCON_RSCLKCFG_PSYSDIV(sysdiv - 1) | SYSCON_RSCLKCFG_USEPLL | regval |= SYSCON_RSCLKCFG_PSYSDIV(sysdiv - 1) |
SYSCON_RSCLKCFG_MEMTIMU | oscselect; SYSCON_RSCLKCFG_OSCSRC_MOSC | SYSCON_RSCLKCFG_PLLSRC_MOSC |
SYSCON_RSCLKCFG_USEPLL | SYSCON_RSCLKCFG_MEMTIMU;
putreg32(regval, TIVA_SYSCON_RSCLKCFG); putreg32(regval, TIVA_SYSCON_RSCLKCFG);
} }
else else