aboutsummaryrefslogtreecommitdiffstats
path: root/wirish
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-03-12 23:28:53 -0500
committerMarti Bolivar <mbolivar@leaflabs.com>2011-03-12 23:28:53 -0500
commite3fae0984dab4f1044ea3ffc1aa41b2df12370b2 (patch)
tree9de019bb440aa7403da64b21d76428544ff6709d /wirish
parent9579e9487c2039df38cc4fd0ac2846ef07cc0947 (diff)
downloadlibrambutan-e3fae0984dab4f1044ea3ffc1aa41b2df12370b2.tar.gz
librambutan-e3fae0984dab4f1044ea3ffc1aa41b2df12370b2.zip
RCC refactor, bugfixes
Diffstat (limited to 'wirish')
-rw-r--r--wirish/boards.cpp2
-rw-r--r--wirish/wirish.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/wirish/boards.cpp b/wirish/boards.cpp
index 9276f36..440218b 100644
--- a/wirish/boards.cpp
+++ b/wirish/boards.cpp
@@ -304,7 +304,7 @@ PinMapping PIN_MAP[NR_GPIO_PINS] = {
/* D98/PG5 */
{GPIOG, 5, ADCx, 0, TIMERx, TIMERx, AFIO_EXTI_PG},
/* D99/PD10 */
- {GPIOD, 10, ADCx, 0, TIMERx, TIMERx, AFIO_EXTI_PDD}
+ {GPIOD, 10, ADCx, 0, TIMERx, TIMERx, AFIO_EXTI_PD}
};
#elif defined(BOARD_maple_mini)
diff --git a/wirish/wirish.cpp b/wirish/wirish.cpp
index f2fb89b..6967489 100644
--- a/wirish/wirish.cpp
+++ b/wirish/wirish.cpp
@@ -52,7 +52,7 @@ void init(void) {
#endif
/* initialize clocks */
- rcc_clk_init(RCC_CLKSRC_PLL, RCC_PLLSRC_HSE, RCC_PLLMUL_9);
+ rcc_clk_init(RCC_CLKSRC_PLL, RCC_CFGR_PLLSRC_HSE, RCC_CFGR_PLLMUL_9);
rcc_set_prescaler(RCC_PRESCALER_AHB, RCC_AHB_SYSCLK_DIV_1);
rcc_set_prescaler(RCC_PRESCALER_APB1, RCC_APB1_HCLK_DIV_2);
rcc_set_prescaler(RCC_PRESCALER_APB2, RCC_APB2_HCLK_DIV_1);