summaryrefslogtreecommitdiff
path: root/nuttx/configs
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-08 06:14:59 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-08 06:14:59 -0600
commit110434b762f0c8d9a90f2a04522aa5a56f244542 (patch)
treebb2e3e83d728a5981f0a65bd36be458f69ef581c /nuttx/configs
parent6f5287675d7e2dcae7d5899d4d8674499cd87be1 (diff)
downloadpx4-nuttx-110434b762f0c8d9a90f2a04522aa5a56f244542.tar.gz
px4-nuttx-110434b762f0c8d9a90f2a04522aa5a56f244542.tar.bz2
px4-nuttx-110434b762f0c8d9a90f2a04522aa5a56f244542.zip
SAM3X/Arduino Due: Fix typo in sam3x_periphclks.h; add SCLK definitions to board.h header file. From Fabien Comte
Diffstat (limited to 'nuttx/configs')
-rw-r--r--nuttx/configs/arduino-due/include/board.h5
-rw-r--r--nuttx/configs/sam4s-xplained-pro/include/board.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/nuttx/configs/arduino-due/include/board.h b/nuttx/configs/arduino-due/include/board.h
index e47158116..c537c783c 100644
--- a/nuttx/configs/arduino-due/include/board.h
+++ b/nuttx/configs/arduino-due/include/board.h
@@ -64,6 +64,10 @@
* CPU clock: 84MHz
*/
+#define BOARD_32KOSC_FREQUENCY (32768)
+#define BOARD_SCLK_FREQUENCY (BOARD_32KOSC_FREQUENCY)
+#define BOARD_MAINOSC_FREQUENCY (12000000) /* MAINOSC: 12MHz crystal on-board */
+
/* Main oscillator register settings.
*
* The start up time should be should be:
@@ -97,7 +101,6 @@
/* Resulting frequencies */
-#define BOARD_MAINOSC_FREQUENCY (12000000) /* MAINOSC: 12MHz crystal on-board */
#define BOARD_PLLA_FREQUENCY (168000000) /* PLLACK: 14 * 12Mhz / 1 */
#define BOARD_MCK_FREQUENCY (84000000) /* MCK: PLLACK / 2 */
#define BOARD_CPU_FREQUENCY (84000000) /* CPU: MCK */
diff --git a/nuttx/configs/sam4s-xplained-pro/include/board.h b/nuttx/configs/sam4s-xplained-pro/include/board.h
index 13ebfd37d..2158bfb34 100644
--- a/nuttx/configs/sam4s-xplained-pro/include/board.h
+++ b/nuttx/configs/sam4s-xplained-pro/include/board.h
@@ -65,7 +65,7 @@
#define BOARD_CKGR_MOR_MOSCXTST (63 << PMC_CKGR_MOR_MOSCXTST_SHIFT) /* Start-up Time */
#define BOARD_32KOSC_FREQUENCY (32768)
-#define BOARD_SLCK_FREQUENCY (BOARD_32KOSC_FREQUENCY)
+#define BOARD_SCLK_FREQUENCY (BOARD_32KOSC_FREQUENCY)
#define BOARD_MAINOSC_FREQUENCY (12000000)
#ifdef CONFIG_SAM34_UDP