jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stm32f4: rcc: Add 84Mhz, max speed for f401

Browse Source 
Basic helpers to at least support common configurations for the f401.

Original submission specified 5 wait states, but the reference manual and other
reviewers all believe that 2ws is sufficient for these modes.

Signed-off-by: Karl Palsson <karlp@tweak.net.au>
This commit is contained in:
Jorik Jonker 2015-03-02 21:18:52 +01:00 committed by Karl Palsson
parent a28ba5cb65
commit 07ee71cf23
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libopencm3/stm32/f4/rcc.h
View File

@ -548,6 +548,7 @@ extern uint32_t rcc_apb2_frequency;
typedef enum { typedef enum {
CLOCK_3V3_48MHZ, CLOCK_3V3_48MHZ,
CLOCK_3V3_84MHZ,
CLOCK_3V3_120MHZ, CLOCK_3V3_120MHZ,
CLOCK_3V3_168MHZ, CLOCK_3V3_168MHZ,
CLOCK_3V3_END CLOCK_3V3_END

52
lib/stm32/f4/rcc.c
View File

@ -64,6 +64,19 @@ const clock_scale_t hse_8mhz_3v3[CLOCK_3V3_END] = {
.apb1_frequency = 12000000, .apb1_frequency = 12000000,
.apb2_frequency = 24000000, .apb2_frequency = 24000000,
}, },
{ /* 84MHz */
.pllm = 8,
.plln = 336,
.pllp = 4,
.pllq = 7,
.hpre = RCC_CFGR_HPRE_DIV_NONE,
.ppre1 = RCC_CFGR_PPRE_DIV_2,
.ppre2 = RCC_CFGR_PPRE_DIV_NONE,
.flash_config = FLASH_ACR_ICE | FLASH_ACR_DCE |
FLASH_ACR_LATENCY_2WS,
.apb1_frequency = 42000000,
.apb2_frequency = 84000000,
},
{ /* 120MHz */ { /* 120MHz */
.pllm = 8, .pllm = 8,
.plln = 240, .plln = 240,
@ -108,6 +121,19 @@ const clock_scale_t hse_12mhz_3v3[CLOCK_3V3_END] = {
.apb1_frequency = 12000000, .apb1_frequency = 12000000,
.apb2_frequency = 24000000, .apb2_frequency = 24000000,
}, },
{ /* 84MHz */
.pllm = 12,
.plln = 336,
.pllp = 4,
.pllq = 7,
.hpre = RCC_CFGR_HPRE_DIV_NONE,
.ppre1 = RCC_CFGR_PPRE_DIV_2,
.ppre2 = RCC_CFGR_PPRE_DIV_NONE,
.flash_config = FLASH_ACR_ICE | FLASH_ACR_DCE |
FLASH_ACR_LATENCY_2WS,
.apb1_frequency = 42000000,
.apb2_frequency = 84000000,
},
{ /* 120MHz */ { /* 120MHz */
.pllm = 12, .pllm = 12,
.plln = 240, .plln = 240,
@ -152,6 +178,19 @@ const clock_scale_t hse_16mhz_3v3[CLOCK_3V3_END] = {
.apb1_frequency = 12000000, .apb1_frequency = 12000000,
.apb2_frequency = 24000000, .apb2_frequency = 24000000,
}, },
{ /* 84MHz */
.pllm = 16,
.plln = 336,
.pllp = 4,
.pllq = 7,
.hpre = RCC_CFGR_HPRE_DIV_NONE,
.ppre1 = RCC_CFGR_PPRE_DIV_2,
.ppre2 = RCC_CFGR_PPRE_DIV_NONE,
.flash_config = FLASH_ACR_ICE | FLASH_ACR_DCE |
FLASH_ACR_LATENCY_2WS,
.apb1_frequency = 42000000,
.apb2_frequency = 84000000,
},
{ /* 120MHz */ { /* 120MHz */
.pllm = 16, .pllm = 16,
.plln = 240, .plln = 240,
@ -196,6 +235,19 @@ const clock_scale_t hse_25mhz_3v3[CLOCK_3V3_END] = {
.apb1_frequency = 12000000, .apb1_frequency = 12000000,
.apb2_frequency = 24000000, .apb2_frequency = 24000000,
}, },
{ /* 84MHz */
.pllm = 25,
.plln = 336,
.pllp = 4,
.pllq = 7,
.hpre = RCC_CFGR_HPRE_DIV_NONE,
.ppre1 = RCC_CFGR_PPRE_DIV_2,
.ppre2 = RCC_CFGR_PPRE_DIV_NONE,
.flash_config = FLASH_ACR_ICE | FLASH_ACR_DCE |
FLASH_ACR_LATENCY_2WS,
.apb1_frequency = 42000000,
.apb2_frequency = 84000000,
},
{ /* 120MHz */ { /* 120MHz */
.pllm = 25, .pllm = 25,
.plln = 240, .plln = 240,