diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-22 11:45:14 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-22 11:45:14 -0600 |
| commit | 40f7dc082d621d5ea6c346c36001ee7c1fb373ec (patch) | |
| tree | 40e7bfd56b1358a921defd31fdd53edf4e679a44 | |
| parent | f6e78dc1e0e97cb3a676b8a676b35818c8a5ca00 (diff) | |
| download | nuttx-40f7dc082d621d5ea6c346c36001ee7c1fb373ec.tar.gz nuttx-40f7dc082d621d5ea6c346c36001ee7c1fb373ec.tar.bz2 nuttx-40f7dc082d621d5ea6c346c36001ee7c1fb373ec.zip | |
Fix a recently introduced typo that was being masked by some bad conditional compilation
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_pck.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/sama5/sam_pck.c b/nuttx/arch/arm/src/sama5/sam_pck.c index e16ab855b..bdcf9d636 100644 --- a/nuttx/arch/arm/src/sama5/sam_pck.c +++ b/nuttx/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 */ |