From 949e002d76bd8c5277f19b36f6ed31ad1de7c7fd Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 22 Jul 2014 11:45:14 -0600
Subject: [PATCH] Fix a recently introduced typo that was being masked by some
 bad conditional compilation

---
 arch/arm/src/sama5/sam_pck.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/arm/src/sama5/sam_pck.c b/arch/arm/src/sama5/sam_pck.c
index e16ab855b4..bdcf9d6366 100644
--- a/arch/arm/src/sama5/sam_pck.c
+++ b/arch/arm/src/sama5/sam_pck.c
@@ -53,8 +53,6 @@
 
 #include "sam_pck.h"
 
-#ifdef CONFIG_SAMA5_ISI
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -118,8 +116,13 @@ uint32_t sam_pck_configure(enum pckid_e pckid, enum pckid_clksrc_e clksrc,
       /* Pick the slow clock */
 
       regval = PMC_PCK_CSS_SLOW;
-      clkin  = BOARD_SCK_FREQUENCY
+      clkin  = BOARD_SLOWCLK_FREQUENCY;
     }
+
+  /* If the source is not the slow clock, then pick either the MCK or the
+   * PLLACK, whichever will best realize the target frequency.
+   */
+
   else
     {
       DEBUGASSERT(BOARD_MCK_FREQUENCY < BOARD_PLLA_FREQUENCY);
@@ -254,4 +257,3 @@ void sam_pck_enable(enum pckid_e pckid, bool enable)
   putreg32(regval, regaddr);
 }
 
-#endif /* CONFIG_SAMA5_ISI */