From 55750d5dc6b592fbf5ccaf3acdd6e9b21d489ffb Mon Sep 17 00:00:00 2001
From: Frantisek Burian <BuFran@seznam.cz>
Date: Wed, 5 Feb 2014 22:46:07 +0100
Subject: [PATCH] [F0] Updated RCC module to be compatible wih RM0091 Rev. 5

---
 include/libopencm3/stm32/f0/rcc.h |  4 +++-
 lib/stm32/f0/rcc.c                | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/include/libopencm3/stm32/f0/rcc.h b/include/libopencm3/stm32/f0/rcc.h
index 2bbd040f..6fbcc92a 100644
--- a/include/libopencm3/stm32/f0/rcc.h
+++ b/include/libopencm3/stm32/f0/rcc.h
@@ -98,7 +98,7 @@ Control</b>
 #define RCC_CFGR_MCOPRE_DIV128			(7 << RCC_CFGR_MCOPRE_SHIFT)
 
 #define RCC_CFGR_MCO_SHIFT			24
-#define RCC_CFGR_MCO				(7 << RCC_CFGR_MCO_SHIFT)
+#define RCC_CFGR_MCO				(15 << RCC_CFGR_MCO_SHIFT)
 #define RCC_CFGR_MCO_NOCLK			(0 << RCC_CFGR_MCO_SHIFT)
 #define RCC_CFGR_MCO_HSI14			(1 << RCC_CFGR_MCO_SHIFT)
 #define RCC_CFGR_MCO_LSI			(2 << RCC_CFGR_MCO_SHIFT)
@@ -107,6 +107,7 @@ Control</b>
 #define RCC_CFGR_MCO_HSI			(5 << RCC_CFGR_MCO_SHIFT)
 #define RCC_CFGR_MCO_HSE			(6 << RCC_CFGR_MCO_SHIFT)
 #define RCC_CFGR_MCO_PLL			(7 << RCC_CFGR_MCO_SHIFT)
+#define RCC_CFGR_MCO_HSI48			(8 << RCC_CFGR_MCO_SHIFT)/*f07*/
 
 #define RCC_CFGR_PLLMUL_SHIFT			18
 #define RCC_CFGR_PLLMUL				(0x0F << RCC_CFGR_PLLMUL_SHIFT)
@@ -347,6 +348,7 @@ Control</b>
 #define RCC_CFGR3_USART2SW_HSI			(3 << RCC_CFGR3_USART2SW_SHIFT)
 
 #define RCC_CFGR3_ADCSW				(1 << 8)
+#define RCC_CFGR3_USBSW				(1 << 7)
 #define RCC_CFGR3_CECSW				(1 << 6)
 #define RCC_CFGR3_I2C1SW			(1 << 4)
 
diff --git a/lib/stm32/f0/rcc.c b/lib/stm32/f0/rcc.c
index 93c5982a..1f37133a 100644
--- a/lib/stm32/f0/rcc.c
+++ b/lib/stm32/f0/rcc.c
@@ -55,6 +55,9 @@ uint32_t rcc_ppre_frequency = 8000000; /* 8MHz after reset */
 void rcc_osc_ready_int_clear(enum rcc_osc osc)
 {
 	switch (osc) {
+	case HSI48:
+		RCC_CIR |= RCC_CIR_HSI48RDYC;
+		break;
 	case HSI14:
 		RCC_CIR |= RCC_CIR_HSI14RDYC;
 		break;
@@ -85,6 +88,9 @@ void rcc_osc_ready_int_clear(enum rcc_osc osc)
 void rcc_osc_ready_int_enable(enum rcc_osc osc)
 {
 	switch (osc) {
+	case HSI48:
+		RCC_CIR |= RCC_CIR_HSI48RDYIE;
+		break;
 	case HSI14:
 		RCC_CIR |= RCC_CIR_HSI14RDYIE;
 		break;
@@ -115,6 +121,9 @@ void rcc_osc_ready_int_enable(enum rcc_osc osc)
 void rcc_osc_ready_int_disable(enum rcc_osc osc)
 {
 	switch (osc) {
+	case HSI48:
+		RCC_CIR &= ~RCC_CIR_HSI48RDYC;
+		break;
 	case HSI14:
 		RCC_CIR &= ~RCC_CIR_HSI14RDYC;
 		break;
@@ -146,6 +155,9 @@ void rcc_osc_ready_int_disable(enum rcc_osc osc)
 int rcc_osc_ready_int_flag(enum rcc_osc osc)
 {
 	switch (osc) {
+	case HSI48:
+		return (RCC_CIR & RCC_CIR_HSI48RDYF) != 0;
+		break;
 	case HSI14:
 		return (RCC_CIR & RCC_CIR_HSI14RDYF) != 0;
 		break;
@@ -198,6 +210,9 @@ int rcc_css_int_flag(void)
 void rcc_wait_for_osc_ready(enum rcc_osc osc)
 {
 	switch (osc) {
+	case HSI48:
+		while ((RCC_CIR & RCC_CIR_HSI48RDYF) != 0);
+		break;
 	case HSI14:
 		while ((RCC_CIR & RCC_CIR_HSI14RDYF) != 0);
 		break;
@@ -234,6 +249,9 @@ void rcc_wait_for_osc_ready(enum rcc_osc osc)
 void rcc_osc_on(enum rcc_osc osc)
 {
 	switch (osc) {
+	case HSI48:
+		RCC_CR2 |= RCC_CR2_HSI48ON;
+		break;
 	case HSI14:
 		RCC_CR2 |= RCC_CR2_HSI14ON;
 		break;
@@ -269,6 +287,9 @@ void rcc_osc_on(enum rcc_osc osc)
 void rcc_osc_off(enum rcc_osc osc)
 {
 	switch (osc) {
+	case HSI48:
+		RCC_CR2 &= ~RCC_CR2_HSI48ON;
+		break;
 	case HSI14:
 		RCC_CR2 &= ~RCC_CR2_HSI14ON;
 		break;
@@ -328,6 +349,7 @@ void rcc_osc_bypass_enable(enum rcc_osc osc)
 	case LSE:
 		RCC_BDCR |= RCC_BDCR_LSEBYP;
 		break;
+	case HSI48:
 	case HSI14:
 	case HSI:
 	case LSI:
@@ -357,6 +379,7 @@ void rcc_osc_bypass_disable(enum rcc_osc osc)
 	case LSE:
 		RCC_BDCR &= ~RCC_BDCR_LSEBYP;
 		break;
+	case HSI48:
 	case HSI14:
 	case PLL:
 	case HSI:
@@ -385,6 +408,9 @@ void rcc_set_sysclk_source(enum rcc_osc clk)
 	case PLL:
 		RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_SW) | RCC_CFGR_SW_PLL;
 		break;
+	case HSI48:
+		RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_SW) | RCC_CFGR_SW_HSI48;
+		break;
 	case LSI:
 	case LSE:
 	case HSI14:
@@ -459,6 +485,8 @@ enum rcc_osc rcc_system_clock_source(void)
 		return HSE;
 	case RCC_CFGR_SWS_PLL:
 		return PLL;
+	case RCC_CFGR_SWS_HSI48:
+		return HSI48;
 	}
 
 	cm3_assert_not_reached();