From 89491f9ceba04e9e0de52e8d2305eec38329e710 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 28 Mar 2010 16:30:22 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1799
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/platforms/LPC11xx/hal_lld.c |  8 ++++++--
 os/hal/platforms/LPC11xx/hal_lld.h | 13 +++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/os/hal/platforms/LPC11xx/hal_lld.c b/os/hal/platforms/LPC11xx/hal_lld.c
index f0b2fdc95..d58648c5e 100644
--- a/os/hal/platforms/LPC11xx/hal_lld.c
+++ b/os/hal/platforms/LPC11xx/hal_lld.c
@@ -83,20 +83,24 @@ void lpc111x_clock_init(void) {
   FLASHCFG = (FLASHCFG & ~3) | LPC11xx_FLASHCFG_FLASHTIM;
 
   /* System oscillator initialization if required.*/
+#if LPC11xx_MAINCLK_SOURCE == SYSMAINCLKSEL_PLLOUT
 #if LPC11xx_PLLCLK_SOURCE == SYSPLLCLKSEL_SYSOSC
   LPC_SYSCON->SYSOSCCTRL = LPC11xx_SYSOSCCTRL;
   LPC_SYSCON->PDRUNCFG &= ~(1 << 5);            /* System oscillator ON.    */
   for (i = 0; i < 200; i++)
     __NOP();                                    /* Stabilization delay.     */
+#endif /* LPC11xx_PLLCLK_SOURCE == SYSPLLCLKSEL_SYSOSC */
 
   /* PLL initialization if required.*/
-#if LPC11xx_MAINCLK_SOURCE == SYSMAINCLKSEL_PLLOUT
+  LPC_SYSCON->SYSPLLCLKSEL = LPC11xx_PLLCLK_SOURCE;
+  LPC_SYSCON->SYSPLLCLKUEN = 1;                 /* Really required?         */
+  LPC_SYSCON->SYSPLLCLKUEN = 0;
+  LPC_SYSCON->SYSPLLCLKUEN = 1;
   LPC_SYSCON->SYSPLLCTRL = LPC11xx_SYSPLLCTRL_MSEL | LPC11xx_SYSPLLCTRL_PSEL;
   LPC_SYSCON->PDRUNCFG &= ~(1 << 7);            /* System PLL ON.           */
   while ((LPC_SYSCON->SYSPLLSTAT & 1) == 0)     /* Wait PLL lock.           */
     ;
 #endif /* LPC11xx_MAINCLK_SOURCE == SYSMAINCLKSEL_PLLOUT */
-#endif /* LPC11xx_PLLCLK_SOURCE == SYSPLLCLKSEL_SYSOSC */
 
   /* Main clock source selection.*/
   LPC_SYSCON->MAINCLKSEL = LPC11xx_MAINCLK_SOURCE;
diff --git a/os/hal/platforms/LPC11xx/hal_lld.h b/os/hal/platforms/LPC11xx/hal_lld.h
index 72c0776f7..be2ecf09e 100644
--- a/os/hal/platforms/LPC11xx/hal_lld.h
+++ b/os/hal/platforms/LPC11xx/hal_lld.h
@@ -48,10 +48,10 @@
 #define SYSPLLCLKSEL_SYSOSC     1           /**< System oscillator clock
                                                  source.                    */
 
-#define SYSMAINCLKSEL_IRCOCS    0
-#define SYSMAINCLKSEL_PLLIN     1
-#define SYSMAINCLKSEL_WDGOSC    2
-#define SYSMAINCLKSEL_PLLOUT    3
+#define SYSMAINCLKSEL_IRCOCS    0           /**< Clock source is IRC.       */
+#define SYSMAINCLKSEL_PLLIN     1           /**< Clock source is PLLIN.     */
+#define SYSMAINCLKSEL_WDGOSC    2           /**< Clock source is WDGOSC.    */
+#define SYSMAINCLKSEL_PLLOUT    3           /**< Clock source is PLLOUT.    */
 
 /*===========================================================================*/
 /* Driver pre-compile time settings.                                         */
@@ -70,7 +70,7 @@
  *          must not exceed the CCO ratings.
  */
 #if !defined(LPC11xx_SYSPLL_MUL) || defined(__DOXYGEN__)
-#define LPC11xx_SYSPLL_MUL      16
+#define LPC11xx_SYSPLL_MUL      4
 #endif
 
 /**
@@ -148,7 +148,8 @@
 /**
  * @brief   CCP frequency.
  */
-#define  LPC11xx_SYSPLLCCO   (LPC11xx_SYSPLLCLKIN * LPC11xx_SYSPLL_MUL)
+#define  LPC11xx_SYSPLLCCO   (LPC11xx_SYSPLLCLKIN * LPC11xx_SYSPLL_MUL *    \
+                              LPC11xx_SYSPLL_DIV)
 
 #if (LPC11xx_SYSPLLCCO < 156000000) || (LPC11xx_SYSPLLCCO > 320000000)
 #error "CCO frequency out of the acceptable range (156...320)"
-- 
cgit v1.2.3