sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sourceforge patch #40. Fix some conditional logic in clock configuration. From Luciano Neri

Browse Source
This commit is contained in:
Gregory Nutt 2014-04-29 11:32:33 -06:00
parent b5947b88a3
commit f25d69ff9a
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -7256,3 +7256,9 @@
CONFIG_ARCH_IRQPRIO is not defined (2014-4-25). CONFIG_ARCH_IRQPRIO is not defined (2014-4-25).
7.3 2014-xx-xx Gregory Nutt <gnutt@nuttx.org> 7.3 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
* arch/arm/src/sama5/sam_clockconfig.c: Needed function sam_pmcwait()
is needed when UDPHS, EHCI, or OHCI is configured but may not be
compiled in due to insufficient conditional logic. From Luciano Neri
(SourceForge patch #40).

12
arch/arm/src/sama5/sam_clockconfig.c
View File

@ -65,6 +65,16 @@
# define NEED_PLLSETUP 1 # define NEED_PLLSETUP 1
#endif #endif
/* Do we need to configure the UPLL */
#if !defined(CONFIG_SAMA5_EHCI) && !defined(CONFIG_SAMA5_OHCI) && \
!defined(CONFIG_SAMA5_UDPHS)
/* No... ignore the board setup */
# undef BOARD_USE_UPLL
#endif
/* Problems have been seen when reconfiguring the PLL while executing out /* Problems have been seen when reconfiguring the PLL while executing out
* of NOR FLASH on CS0. In that case, we required RAM function support. The * of NOR FLASH on CS0. In that case, we required RAM function support. The
* critical functions will be copied from NOR into ISRAM for execution. This * critical functions will be copied from NOR into ISRAM for execution. This
@ -103,7 +113,7 @@
* *
****************************************************************************/ ****************************************************************************/
#if defined(NEED_PLLSETUP) #if defined(NEED_PLLSETUP) || defined(BOARD_USE_UPLL)
static void __ramfunc__ sam_pmcwait(uint32_t bit) static void __ramfunc__ sam_pmcwait(uint32_t bit)
{ {
/* There is no timeout on this wait. Why not? Because the symptoms there /* There is no timeout on this wait. Why not? Because the symptoms there