diff --git a/arch/arm/src/sama5/sam_sckc.c b/arch/arm/src/sama5/sam_sckc.c
index 05222bcda18..adc96561799 100644
--- a/arch/arm/src/sama5/sam_sckc.c
+++ b/arch/arm/src/sama5/sam_sckc.c
@@ -100,7 +100,7 @@ void sam_sckc_enable(bool enable)
   regval |= SCKC_CR_OSC32EN;
   putreg32(regval, SAM_SCKC_CR);
 
-  /* Wait 5 slow clock cycles for clock stabilization */
+  /* Wait for 32,768 XTAL start-up time */
 
   up_udelay(5 * USEC_PER_SEC / BOARD_SLOWCLK_FREQUENCY);
 
diff --git a/configs/sama5d3x-ek/src/sam_wm8904.c b/configs/sama5d3x-ek/src/sam_wm8904.c
index e6cf8583589..1274443aa04 100644
--- a/configs/sama5d3x-ek/src/sam_wm8904.c
+++ b/configs/sama5d3x-ek/src/sam_wm8904.c
@@ -276,12 +276,12 @@ int sam_wm8904_initialize(int minor)
           goto errout_with_i2s;
         }
 
-      /* Configure the DAC master clock.  This clock is provided by PCK2 (PB10)
+      /* Configure the DAC master clock.  This clock is provided by PCK0 (PD30)
        * that is connected to the WM8904 MCLK.
        */
 
       sam_sckc_enable(true);
-      (void)sam_pck_configure(PCK2, PCKSRC_SCK, BOARD_SLOWCLK_FREQUENCY);
+      (void)sam_pck_configure(PCK0, PCKSRC_SCK, BOARD_SLOWCLK_FREQUENCY);
 
       /* Enable the DAC master clock */
 
diff --git a/configs/sama5d4-ek/src/sam_wm8904.c b/configs/sama5d4-ek/src/sam_wm8904.c
index 388bf499a48..a963692c001 100644
--- a/configs/sama5d4-ek/src/sam_wm8904.c
+++ b/configs/sama5d4-ek/src/sam_wm8904.c
@@ -285,7 +285,7 @@ int sam_wm8904_initialize(int minor)
 
       /* Enable the DAC master clock */
 
-      sam_pck_enable(PCK0, true);
+      sam_pck_enable(PCK2, true);
 
       /* Configure WM8904 interrupts */