diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-01 15:18:58 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-01 15:18:58 -0600 |
| commit | 7b786e77b8d8f39915f45553a376655889778876 (patch) | |
| tree | 92a7186ed2ba5e62ceea782224fa2fbf18fc927b /nuttx | |
| parent | 3cfef51718a20a4726de10cd6d6c9460a093ca5e (diff) | |
| download | px4-nuttx-7b786e77b8d8f39915f45553a376655889778876.tar.gz px4-nuttx-7b786e77b8d8f39915f45553a376655889778876.tar.bz2 px4-nuttx-7b786e77b8d8f39915f45553a376655889778876.zip | |
SAMA5 WM8904: Fix errors in programmable clock output configuration
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_sckc.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/sama5d3x-ek/src/sam_wm8904.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/src/sam_wm8904.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/sama5/sam_sckc.c b/nuttx/arch/arm/src/sama5/sam_sckc.c index 05222bcda..adc965617 100644 --- a/nuttx/arch/arm/src/sama5/sam_sckc.c +++ b/nuttx/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/nuttx/configs/sama5d3x-ek/src/sam_wm8904.c b/nuttx/configs/sama5d3x-ek/src/sam_wm8904.c index e6cf85835..1274443aa 100644 --- a/nuttx/configs/sama5d3x-ek/src/sam_wm8904.c +++ b/nuttx/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/nuttx/configs/sama5d4-ek/src/sam_wm8904.c b/nuttx/configs/sama5d4-ek/src/sam_wm8904.c index 388bf499a..a963692c0 100644 --- a/nuttx/configs/sama5d4-ek/src/sam_wm8904.c +++ b/nuttx/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 */ |