diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-16 19:16:57 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-16 19:16:57 +0000 |
| commit | 4206c173f382c8e5a7aabcd491199df1bd44eadf (patch) | |
| tree | e1cafeb5a0f0a37ddba7920576ec5ff4404be0d4 /nuttx/arch | |
| parent | 9b26924fbfabc53ef5736aa2b94912571a19ba4d (diff) | |
| download | px4-nuttx-4206c173f382c8e5a7aabcd491199df1bd44eadf.tar.gz px4-nuttx-4206c173f382c8e5a7aabcd491199df1bd44eadf.tar.bz2 px4-nuttx-4206c173f382c8e5a7aabcd491199df1bd44eadf.zip | |
Fix an error in LPC43xx clock configuratin that can cause fail to boot
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4945 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/src/lpc43xx/lpc43_adc.c | 1 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c b/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c index a6489a6d0..d9165ba75 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c @@ -65,7 +65,6 @@ #include "up_arch.h" #include "chip.h" -#include "lpc43_internal.h" #include "lpc43_syscon.h" #include "lpc43_pinconn.h" #include "lpc43_adc.h" diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c b/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c index 180d17bda..8e266e039 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c @@ -163,13 +163,13 @@ static inline void lpc43_xtalconfig(void) /* Select the crystal oscillator as the input to PLL1 */ regval = getreg32(LPC43_PLL1_CTRL); - regval &= PLL1_CTRL_CLKSEL_MASK; + regval &= ~PLL1_CTRL_CLKSEL_MASK; regval |= PLL1_CLKSEL_XTAL | PLL1_CTRL_AUTOBLOCK; putreg32(regval, LPC43_PLL1_CTRL); } /**************************************************************************** - * Name: lpc43_clockconfig + * Name: lpc43_pll1config * * Description: * Configure PLL1 dividers and multipliers per the settings in the board.h @@ -197,11 +197,11 @@ static inline void lpc43_pll1config(void) PLL1_CTRL_MSEL_MASK); putreg32(regval, LPC43_PLL1_CTRL); - /* Clear PLL1 controls: + /* Set selected PLL1 controls: * * - PLL1_CTRL_FBSEL: Set in both integer and direct modes * - PLL1_CTRL_DIRECT: Set in direct mode - * - PLL1_CTRL_PSEL: Set to the value from board.h + * - PLL1_CTRL_PSEL: Set to the value from board.h (integer mode only) * - PLL1_CTRL_NSEL: Set to the value from board.h * - PLL1_CTRL_MSEL: Set to the value from board.h */ |