From b0b8710f291008f09c0512099dd22ec00b034062 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 16 Jul 2012 19:16:57 +0000 Subject: [PATCH] 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 --- arch/arm/src/lpc43xx/lpc43_adc.c | 1 - arch/arm/src/lpc43xx/lpc43_cgu.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/src/lpc43xx/lpc43_adc.c b/arch/arm/src/lpc43xx/lpc43_adc.c index a6489a6d080..d9165ba75f5 100644 --- a/arch/arm/src/lpc43xx/lpc43_adc.c +++ b/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/arch/arm/src/lpc43xx/lpc43_cgu.c b/arch/arm/src/lpc43xx/lpc43_cgu.c index 180d17bda65..8e266e03940 100644 --- a/arch/arm/src/lpc43xx/lpc43_cgu.c +++ b/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 */