aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32/f4/rcc.c
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2013-02-18 14:09:31 -0800
committerPiotr Esden-Tempski2013-02-18 14:09:31 -0800
commit6eef01ce26243184c04a0f8e8409912d8924a14c (patch)
treed585ac23f1482edc1544c794cf5e4f7b2171d13a /lib/stm32/f4/rcc.c
parentf980f197ca17c324089f8650fee9df081e5502e6 (diff)
parent40d9d630f0769a374ddc12616323dc6a94f02b7f (diff)
Merge pull request #84 "Pr flash reg rename"
Merge remote-tracking branch 'karlp/pr_flash-reg-rename' Conflicts: include/libopencm3/stm32/l1/flash.h
Diffstat (limited to 'lib/stm32/f4/rcc.c')
-rw-r--r--lib/stm32/f4/rcc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stm32/f4/rcc.c b/lib/stm32/f4/rcc.c
index f506d4b..1024f0b 100644
--- a/lib/stm32/f4/rcc.c
+++ b/lib/stm32/f4/rcc.c
@@ -39,7 +39,7 @@ const clock_scale_t hse_8mhz_3v3[CLOCK_3V3_END] =
.ppre1 = RCC_CFGR_PPRE_DIV_4,
.ppre2 = RCC_CFGR_PPRE_DIV_2,
.power_save = 1,
- .flash_config = FLASH_ICE | FLASH_DCE | FLASH_LATENCY_3WS,
+ .flash_config = FLASH_ACR_ICE | FLASH_ACR_DCE | FLASH_ACR_LATENCY_3WS,
.apb1_frequency = 30000000,
.apb2_frequency = 60000000,
},
@@ -51,7 +51,7 @@ const clock_scale_t hse_8mhz_3v3[CLOCK_3V3_END] =
.hpre = RCC_CFGR_HPRE_DIV_NONE,
.ppre1 = RCC_CFGR_PPRE_DIV_4,
.ppre2 = RCC_CFGR_PPRE_DIV_2,
- .flash_config = FLASH_ICE | FLASH_DCE | FLASH_LATENCY_5WS,
+ .flash_config = FLASH_ACR_ICE | FLASH_ACR_DCE | FLASH_ACR_LATENCY_5WS,
.apb1_frequency = 42000000,
.apb2_frequency = 84000000,
},