diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-09 07:55:51 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-09 07:55:51 -0600 |
commit | 53b071990d48822f6b394933a3142a65c60a1be2 (patch) | |
tree | 8222933814cdf67d341846a5c7e27ef3e20682b9 /nuttx/configs | |
parent | d36fb6d9140f2a6b1a67d93a7922411b4aaeb119 (diff) | |
download | nuttx-53b071990d48822f6b394933a3142a65c60a1be2.tar.gz nuttx-53b071990d48822f6b394933a3142a65c60a1be2.tar.bz2 nuttx-53b071990d48822f6b394933a3142a65c60a1be2.zip |
SAMA5D4: Completes PMC modifications for the SAMA5D4
Diffstat (limited to 'nuttx/configs')
-rw-r--r-- | nuttx/configs/sama5d4-ek/include/board_384mhz.h | 6 | ||||
-rw-r--r-- | nuttx/configs/sama5d4-ek/include/board_396mhz.h | 6 | ||||
-rw-r--r-- | nuttx/configs/sama5d4-ek/include/board_528mhz.h | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/nuttx/configs/sama5d4-ek/include/board_384mhz.h b/nuttx/configs/sama5d4-ek/include/board_384mhz.h index 91326ce62..878c82222 100644 --- a/nuttx/configs/sama5d4-ek/include/board_384mhz.h +++ b/nuttx/configs/sama5d4-ek/include/board_384mhz.h @@ -55,7 +55,7 @@ * the PLLACK be a multiple of 48MHz. This setup results in a CPU clock of 384MHz. * * MAINOSC: Frequency = 12MHz (crystal) - * PLLA: PLL Divider = 1, Multiplier = 64 to generate PLLACK = 768MHz + * PLLA: PLL Multiplier = 64 to generate PLLACK = 768MHz * Master Clock (MCK): Source = PLLACK/2, Prescalar = 1, MDIV = 3 to generate * MCK = 128MHz * CPU clock = 384MHz @@ -71,14 +71,12 @@ /* PLLA configuration. * - * Divider = 1 - * Multipler = 64 + * Multipler = 64: PLLACK = 64 * 12MHz = 768MHz */ #define BOARD_CKGR_PLLAR_COUNT (63 << PMC_CKGR_PLLAR_COUNT_SHIFT) #define BOARD_CKGR_PLLAR_OUT (0) #define BOARD_CKGR_PLLAR_MUL (63 << PMC_CKGR_PLLAR_MUL_SHIFT) -#define BOARD_CKGR_PLLAR_DIV PMC_CKGR_PLLAR_DIV_BYPASS /* PMC master clock register settings. * diff --git a/nuttx/configs/sama5d4-ek/include/board_396mhz.h b/nuttx/configs/sama5d4-ek/include/board_396mhz.h index 281463d56..a20527403 100644 --- a/nuttx/configs/sama5d4-ek/include/board_396mhz.h +++ b/nuttx/configs/sama5d4-ek/include/board_396mhz.h @@ -54,7 +54,7 @@ * CPU clock of 396MHz: * * MAINOSC: Frequency = 12MHz (crystal) - * PLLA: PLL Divider = 1, Multiplier = 66 to generate PLLACK = 792MHz + * PLLA: PLL Multiplier = 66 to generate PLLACK = 792MHz * Master Clock (MCK): Source = PLLACK/2, Prescalar = 1, MDIV = 3 to generate * MCK = 132MHz * CPU clock = 396MHz @@ -70,14 +70,12 @@ /* PLLA configuration. * - * Divider = 1 - * Multipler = 66 + * Multipler = 66: PLLACK = 66 * 12MHz = 792MHz */ #define BOARD_CKGR_PLLAR_COUNT (63 << PMC_CKGR_PLLAR_COUNT_SHIFT) #define BOARD_CKGR_PLLAR_OUT (0) #define BOARD_CKGR_PLLAR_MUL (65 << PMC_CKGR_PLLAR_MUL_SHIFT) -#define BOARD_CKGR_PLLAR_DIV PMC_CKGR_PLLAR_DIV_BYPASS /* PMC master clock register settings. * diff --git a/nuttx/configs/sama5d4-ek/include/board_528mhz.h b/nuttx/configs/sama5d4-ek/include/board_528mhz.h index d12f78b1f..446a480ab 100644 --- a/nuttx/configs/sama5d4-ek/include/board_528mhz.h +++ b/nuttx/configs/sama5d4-ek/include/board_528mhz.h @@ -53,7 +53,7 @@ * This is the configuration results in a CPU clock of 528MHz: * * MAINOSC: Frequency = 12MHz (crystal) - * PLLA: PLL Divider = 1, Multiplier = 43+1 to generate PLLACK = 528MHz + * PLLA: PLL Multiplier = 43+1 to generate PLLACK = 528MHz * Master Clock (MCK): Source = PLLACK/1, Prescalar = 1, MDIV = 4 to generate * MCK = 132MHz * CPU clock = 528MHz @@ -69,14 +69,12 @@ /* PLLA configuration. * - * Divider = 1 - * Multipler = 43+1 + * Multipler = 43+1: PLLACK = 44 * 12MHz = 528MHz */ #define BOARD_CKGR_PLLAR_COUNT (63 << PMC_CKGR_PLLAR_COUNT_SHIFT) #define BOARD_CKGR_PLLAR_OUT (0) #define BOARD_CKGR_PLLAR_MUL (43 << PMC_CKGR_PLLAR_MUL_SHIFT) -#define BOARD_CKGR_PLLAR_DIV PMC_CKGR_PLLAR_DIV_BYPASS /* PMC master clock register settings. * |