Fix an error in LPC43xx clock configuratin that can cause fail to boot
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4945 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
parent
32c88f81c0
commit
fa4c614079
|
@ -23,6 +23,7 @@
|
||||||
<li><a href="http://freshmeat.net/projects/nuttx/" target="_top">FreshMeat</a></li>
|
<li><a href="http://freshmeat.net/projects/nuttx/" target="_top">FreshMeat</a></li>
|
||||||
<li><a href="http://tech.groups.yahoo.com/group/nuttx/" target="_top">Forum</a></li>
|
<li><a href="http://tech.groups.yahoo.com/group/nuttx/" target="_top">Forum</a></li>
|
||||||
<li><a href="http://sourceforge.net/projects/nuttx/files/" target="_top">Downloads</a></li>
|
<li><a href="http://sourceforge.net/projects/nuttx/files/" target="_top">Downloads</a></li>
|
||||||
|
<li><a href="http://www.nx-engineering.com/nuttx-wiki/" target="_top">Wiki</a></li>
|
||||||
<li><a href="http://sourceforge.net/projects/nuttx/files/buildroot" target="_top">Toolchains</a></li>
|
<li><a href="http://sourceforge.net/projects/nuttx/files/buildroot" target="_top">Toolchains</a></li>
|
||||||
<li><a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/" target="_top">Browse SVN</a></li>
|
<li><a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/" target="_top">Browse SVN</a></li>
|
||||||
<li><a href="freeports.html" target="header">Free Ports</a></li>
|
<li><a href="freeports.html" target="header">Free Ports</a></li>
|
||||||
|
|
|
@ -65,7 +65,6 @@
|
||||||
#include "up_arch.h"
|
#include "up_arch.h"
|
||||||
|
|
||||||
#include "chip.h"
|
#include "chip.h"
|
||||||
#include "lpc43_internal.h"
|
|
||||||
#include "lpc43_syscon.h"
|
#include "lpc43_syscon.h"
|
||||||
#include "lpc43_pinconn.h"
|
#include "lpc43_pinconn.h"
|
||||||
#include "lpc43_adc.h"
|
#include "lpc43_adc.h"
|
||||||
|
|
|
@ -163,13 +163,13 @@ static inline void lpc43_xtalconfig(void)
|
||||||
/* Select the crystal oscillator as the input to PLL1 */
|
/* Select the crystal oscillator as the input to PLL1 */
|
||||||
|
|
||||||
regval = getreg32(LPC43_PLL1_CTRL);
|
regval = getreg32(LPC43_PLL1_CTRL);
|
||||||
regval &= PLL1_CTRL_CLKSEL_MASK;
|
regval &= ~PLL1_CTRL_CLKSEL_MASK;
|
||||||
regval |= PLL1_CLKSEL_XTAL | PLL1_CTRL_AUTOBLOCK;
|
regval |= PLL1_CLKSEL_XTAL | PLL1_CTRL_AUTOBLOCK;
|
||||||
putreg32(regval, LPC43_PLL1_CTRL);
|
putreg32(regval, LPC43_PLL1_CTRL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: lpc43_clockconfig
|
* Name: lpc43_pll1config
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Configure PLL1 dividers and multipliers per the settings in the board.h
|
* 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);
|
PLL1_CTRL_MSEL_MASK);
|
||||||
putreg32(regval, LPC43_PLL1_CTRL);
|
putreg32(regval, LPC43_PLL1_CTRL);
|
||||||
|
|
||||||
/* Clear PLL1 controls:
|
/* Set selected PLL1 controls:
|
||||||
*
|
*
|
||||||
* - PLL1_CTRL_FBSEL: Set in both integer and direct modes
|
* - PLL1_CTRL_FBSEL: Set in both integer and direct modes
|
||||||
* - PLL1_CTRL_DIRECT: Set in direct mode
|
* - 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_NSEL: Set to the value from board.h
|
||||||
* - PLL1_CTRL_MSEL: Set to the value from board.h
|
* - PLL1_CTRL_MSEL: Set to the value from board.h
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -75,11 +75,11 @@
|
||||||
|
|
||||||
/* Integer and direct modes are supported:
|
/* Integer and direct modes are supported:
|
||||||
*
|
*
|
||||||
* In integer mode:
|
* In integer mode (Fclkout < 156000000):
|
||||||
* Fclkin = BOARD_XTAL_FREQUENCY
|
* Fclkin = BOARD_XTAL_FREQUENCY
|
||||||
* Fclkout = Msel * FClkin / Nsel
|
* Fclkout = Msel * FClkin / Nsel
|
||||||
* Fcco = 2 * Psel * Nclkout
|
* Fcco = 2 * Psel * Fclkout
|
||||||
* In direct mode:
|
* In direct mode (Fclkout > 156000000):
|
||||||
* Fclkin = BOARD_XTAL_FREQUENCY
|
* Fclkin = BOARD_XTAL_FREQUENCY
|
||||||
* Fclkout = Msel * FClkin / Nsel
|
* Fclkout = Msel * FClkin / Nsel
|
||||||
* Fcco = Fclkout
|
* Fcco = Fclkout
|
||||||
|
|
|
@ -112,6 +112,7 @@ static int devnull_poll(FAR struct file *filp, FAR struct pollfd *fds,
|
||||||
sem_post(fds->sem);
|
sem_post(fds->sem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue