+
+
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
*/
diff --git a/nuttx/configs/lpc4330-xplorer/include/board.h b/nuttx/configs/lpc4330-xplorer/include/board.h
index c3b5bb759..94de34832 100644
--- a/nuttx/configs/lpc4330-xplorer/include/board.h
+++ b/nuttx/configs/lpc4330-xplorer/include/board.h
@@ -75,11 +75,11 @@
/* Integer and direct modes are supported:
*
- * In integer mode:
+ * In integer mode (Fclkout < 156000000):
* Fclkin = BOARD_XTAL_FREQUENCY
* Fclkout = Msel * FClkin / Nsel
- * Fcco = 2 * Psel * Nclkout
- * In direct mode:
+ * Fcco = 2 * Psel * Fclkout
+ * In direct mode (Fclkout > 156000000):
* Fclkin = BOARD_XTAL_FREQUENCY
* Fclkout = Msel * FClkin / Nsel
* Fcco = Fclkout
diff --git a/nuttx/drivers/dev_null.c b/nuttx/drivers/dev_null.c
index e2c4c7ef7..c70370e1e 100644
--- a/nuttx/drivers/dev_null.c
+++ b/nuttx/drivers/dev_null.c
@@ -112,6 +112,7 @@ static int devnull_poll(FAR struct file *filp, FAR struct pollfd *fds,
sem_post(fds->sem);
}
}
+
return OK;
}
#endif
-
- 
- 
-
-