diff --git a/arch/arm/src/samdl/saml_clockconfig.c b/arch/arm/src/samdl/saml_clockconfig.c
index dbfc77b7820..11dbaff10f6 100644
--- a/arch/arm/src/samdl/saml_clockconfig.c
+++ b/arch/arm/src/samdl/saml_clockconfig.c
@@ -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
 
diff --git a/configs/saml21-xplained/Kconfig b/configs/saml21-xplained/Kconfig
index ec2f54ced46..1f6fb9a6124 100644
--- a/configs/saml21-xplained/Kconfig
+++ b/configs/saml21-xplained/Kconfig
@@ -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"
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index 9786b618ad5..80925b920de 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -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