From 622475f5437ae857442bba1579224452f28409d9 Mon Sep 17 00:00:00 2001
From: Karl Palsson <karlp@tweak.net.au>
Date: Mon, 30 Apr 2018 23:28:20 +0000
Subject: [PATCH] BREAKING: stm32f3:rcc: use more common MUL names

Make the defines as they are on other families, try and make more
defines the same, not arbitrarily different.
---
 include/libopencm3/stm32/f3/rcc.h | 30 +++++++++++++++---------------
 lib/stm32/f3/rcc.c                |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/libopencm3/stm32/f3/rcc.h b/include/libopencm3/stm32/f3/rcc.h
index c813fea1..7961b851 100644
--- a/include/libopencm3/stm32/f3/rcc.h
+++ b/include/libopencm3/stm32/f3/rcc.h
@@ -106,21 +106,21 @@
 /* PLLMUL: PLL multiplication factor */
 #define RCC_CFGR_PLLMUL_SHIFT			18
 #define RCC_CFGR_PLLMUL_MASK			0xF
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X2		0x0
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X3		0x1
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X4		0x2
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X5		0x3
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X6		0x4
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X7		0x5
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X8		0x6
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X9		0x7
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X10		0x8
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X11		0x9
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X12		0xA
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X13		0xB
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X14		0xC
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X15		0xD
-#define RCC_CFGR_PLLMUL_PLL_IN_CLK_X16		0xE
+#define RCC_CFGR_PLLMUL_MUL2		0x0
+#define RCC_CFGR_PLLMUL_MUL3		0x1
+#define RCC_CFGR_PLLMUL_MUL4		0x2
+#define RCC_CFGR_PLLMUL_MUL5		0x3
+#define RCC_CFGR_PLLMUL_MUL6		0x4
+#define RCC_CFGR_PLLMUL_MUL7		0x5
+#define RCC_CFGR_PLLMUL_MUL8		0x6
+#define RCC_CFGR_PLLMUL_MUL9		0x7
+#define RCC_CFGR_PLLMUL_MUL10		0x8
+#define RCC_CFGR_PLLMUL_MUL11		0x9
+#define RCC_CFGR_PLLMUL_MUL12		0xA
+#define RCC_CFGR_PLLMUL_MUL13		0xB
+#define RCC_CFGR_PLLMUL_MUL14		0xC
+#define RCC_CFGR_PLLMUL_MUL15		0xD
+#define RCC_CFGR_PLLMUL_MUL16		0xE
 
 /* PPRE2: APB high-speed prescaler (APB2) */
 #define RCC_CFGR_PPRE2_SHIFT			11
diff --git a/lib/stm32/f3/rcc.c b/lib/stm32/f3/rcc.c
index 0a69efee..1c86cf44 100644
--- a/lib/stm32/f3/rcc.c
+++ b/lib/stm32/f3/rcc.c
@@ -46,7 +46,7 @@ uint32_t rcc_apb2_frequency = 8000000;
 
 const struct rcc_clock_scale rcc_hsi_8mhz[RCC_CLOCK_END] = {
 	{ /* 44MHz */
-		.pll = RCC_CFGR_PLLMUL_PLL_IN_CLK_X11,
+		.pll = RCC_CFGR_PLLMUL_MUL11,
 		.pllsrc = RCC_CFGR_PLLSRC_HSI_DIV2,
 		.hpre = RCC_CFGR_HPRE_DIV_NONE,
 		.ppre1 = RCC_CFGR_PPRE1_DIV_2,
@@ -57,7 +57,7 @@ const struct rcc_clock_scale rcc_hsi_8mhz[RCC_CLOCK_END] = {
 		.apb2_frequency = 44000000,
 	},
 	{ /* 48MHz */
-		.pll = RCC_CFGR_PLLMUL_PLL_IN_CLK_X12,
+		.pll = RCC_CFGR_PLLMUL_MUL12,
 		.pllsrc = RCC_CFGR_PLLSRC_HSI_DIV2,
 		.hpre = RCC_CFGR_HPRE_DIV_NONE,
 		.ppre1 = RCC_CFGR_PPRE1_DIV_2,
@@ -68,7 +68,7 @@ const struct rcc_clock_scale rcc_hsi_8mhz[RCC_CLOCK_END] = {
 		.apb2_frequency = 48000000,
 	},
 	{ /* 64MHz */
-		.pll = RCC_CFGR_PLLMUL_PLL_IN_CLK_X16,
+		.pll = RCC_CFGR_PLLMUL_MUL16,
 		.pllsrc = RCC_CFGR_PLLSRC_HSI_DIV2,
 		.hpre = RCC_CFGR_HPRE_DIV_NONE,
 		.ppre1 = RCC_CFGR_PPRE1_DIV_2,