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

SAM4L: Fix some issues from loast commit. Now running off DFLL with source clock = XOSCK32K

Browse Source
This commit is contained in:
Gregory Nutt 2015-05-26 13:25:39 -06:00
parent 315eb4b491
commit fabd892d3a
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/src/samdl/saml_clockconfig.c
View File

@ -864,8 +864,8 @@ static inline void sam_dfll48m_config(void)
control |= OSCCTRL_DFLLCTRL_LLAW; /* Lose lock after wake */
#endif
#ifndef BOARD_DFLL48M_RUNINSTDBY
control |= OSCCTRL_DFLLCTRL_RUNSTDBY; /* Chill cycle disable */
#ifdef BOARD_DFLL48M_RUNINSTDBY
control |= OSCCTRL_DFLLCTRL_RUNSTDBY; /* Run in standby */
#endif
#ifndef BOARD_DFLL48M_ENABLECHILLCYCLE
@ -873,14 +873,14 @@ static inline void sam_dfll48m_config(void)
#endif
#ifndef BOARD_DFLL48M_QUICKLOCK
control |= OSCCTRL_DFLLCTRL_QLDIS; /* Quick lock disable */
control |= OSCCTRL_DFLLCTRL_QLDIS; /* Quick lock disable */
#endif
#ifndef BOARD_DFLL48M_BPLCKC
control |= OSCCTRL_DFLLCTRL_BPLCKC; /* Bypass coarse clock */
#ifdef BOARD_DFLL48M_BPLCKC
control |= OSCCTRL_DFLLCTRL_BPLCKC; /* Bypass coarse clock */
#endif
#ifndef BOARD_DFLL48M_WAITLOCK
#ifdef BOARD_DFLL48M_WAITLOCK
control |= OSCCTRL_DFLLCTRL_WAITLOCK; /* Wait lock */
#endif

2
configs/saml21-xplained/Kconfig
View File

@ -36,6 +36,7 @@ config SAML21_XPLAINED_DFLL
choice
prompt "DFLL Clock Source"
default SAML21_XPLAINED_DFLL_OSC16MSRC
depends on SAML21_XPLAINED_DFLL
config SAML21_XPLAINED_DFLL_OSC16MSRC
bool "OSC16M"
@ -49,6 +50,7 @@ endchoice # DFLL Clock Source
choice
prompt "DFLL Operating Mode"
default SAML21_XPLAINED_DFLL_OPENLOOP
depends on SAML21_XPLAINED_DFLL
config SAML21_XPLAINED_DFLL_OPENLOOP
bool "DFLL Open Loop Mode"

10
configs/saml21-xplained/nsh/defconfig
View File

@ -210,7 +210,7 @@ CONFIG_ARCH_STACKDUMP=y
#
# Board Settings
#
CONFIG_BOARD_LOOPSPERMSEC=3410
CONFIG_BOARD_LOOPSPERMSEC=4356
# CONFIG_ARCH_CALIBRATION is not set
#
@ -265,10 +265,10 @@ CONFIG_SAML21_XPLAINED_OSC16M_4MHZ=y
# CONFIG_SAML21_XPLAINED_OSC16M_8MHZ is not set
# CONFIG_SAML21_XPLAINED_OSC16M_12MHZ is not set
# CONFIG_SAML21_XPLAINED_OSC16M_16MHZ is not set
# CONFIG_SAM21_XPLAINED_XOSC32K is not set
# CONFIG_SAML21_XPLAINED_DFLL is not set
CONFIG_SAML21_XPLAINED_DFLL_OSC16MSRC=y
# CONFIG_SAML21_XPLAINED_DFLL_XOSC32KSRC is not set
CONFIG_SAM21_XPLAINED_XOSC32K=y
CONFIG_SAML21_XPLAINED_DFLL=y
# CONFIG_SAML21_XPLAINED_DFLL_OSC16MSRC is not set
CONFIG_SAML21_XPLAINED_DFLL_XOSC32KSRC=y
# CONFIG_SAML21_XPLAINED_DFLL_OPENLOOP is not set
CONFIG_SAML21_XPLAINED_DFLL_CLOSEDLOOP=y