From 2dbd8fea1aab8bdaa435ff52139153c92b29ee90 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Fri, 11 May 2018 14:06:21 +0000
Subject: STM32F4 clock tree rework, unfinished.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12022 110e8d01-0319-4d1e-a829-52ad28d1bb01
---
 os/hal/ports/STM32/STM32F4xx/stm32_registry.h | 79 +++++++++++++++++++--------
 1 file changed, 56 insertions(+), 23 deletions(-)

(limited to 'os/hal/ports/STM32/STM32F4xx/stm32_registry.h')

diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
index 3557b3d79..affcb6d73 100644
--- a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
@@ -90,9 +90,12 @@
 #if defined(STM32F469_479xx) || defined(__DOXYGEN__)
 
 /* Clock tree attributes.*/
-#define STM32_HAS_RCC_SAIPLL                TRUE
-#define STM32_HAS_RCC_I2CPLL                TRUE
+#define STM32_HAS_RCC_PLLSAI                TRUE
+#define STM32_HAS_RCC_PLLI2S                TRUE
+#define STM32_HAS_RCC_I2SSRC                TRUE
+#define STM32_HAS_RCC_I2SPLLSRC             FALSE
 #define STM32_HAS_RCC_CK48MSEL              TRUE
+#define STM32_RCC_CK48MSEL_USES_I2S         FALSE
 
 /* ADC attributes.*/
 #define STM32_ADC_HANDLER                   Vector88
@@ -466,9 +469,12 @@
 #if defined(STM32F446xx)
 
 /* Clock tree attributes.*/
-#define STM32_HAS_RCC_SAIPLL                TRUE
-#define STM32_HAS_RCC_I2CPLL                TRUE
+#define STM32_HAS_RCC_PLLSAI                TRUE
+#define STM32_HAS_RCC_PLLI2S                TRUE
+#define STM32_HAS_RCC_I2SSRC                FALSE
+#define STM32_HAS_RCC_I2SPLLSRC             FALSE
 #define STM32_HAS_RCC_CK48MSEL              TRUE
+#define STM32_RCC_CK48MSEL_USES_I2S         FALSE
 
 /* ADC attributes.*/
 #define STM32_ADC_HANDLER                   Vector88
@@ -817,9 +823,14 @@
 #if defined(STM32F429_439xx) || defined(STM32F427_437xx)
 
 /* Clock tree attributes.*/
-#define STM32_HAS_RCC_SAIPLL                TRUE
-#define STM32_HAS_RCC_I2CPLL                TRUE
+#define STM32_HAS_RCC_PLLSAI                TRUE
+#define STM32_HAS_RCC_PLLI2S                TRUE
+#define STM32_HAS_RCC_CK48MSEL_I2S          FALSE
+#define STM32_HAS_RCC_CK48MSEL_SAI          FALSE
+#define STM32_HAS_RCC_I2SSRC                TRUE
+#define STM32_HAS_RCC_I2SPLLSRC             FALSE
 #define STM32_HAS_RCC_CK48MSEL              FALSE
+#define STM32_RCC_CK48MSEL_USES_I2S         FALSE
 
 /* ADC attributes.*/
 #define STM32_ADC_HANDLER                   Vector88
@@ -1183,15 +1194,18 @@
 #endif /* defined(STM32F429_439xx) || defined(STM32F427_437xx) */
 
 /*===========================================================================*/
-/* STM32F413xx, STM32F413Mx, STM32F413Rx, STM32F413Vx, STM32F413Zx           */
+/* STM32F413xx.                                                              */
 /*===========================================================================*/
 
 #if defined(STM32F413xx)
 
 /* Clock tree attributes.*/
-#define STM32_HAS_RCC_SAIPLL                FALSE
-#define STM32_HAS_RCC_I2CPLL                TRUE
+#define STM32_HAS_RCC_PLLSAI                FALSE
+#define STM32_HAS_RCC_PLLI2S                TRUE
+#define STM32_HAS_RCC_I2SSRC                FALSE
+#define STM32_HAS_RCC_I2SPLLSRC             TRUE
 #define STM32_HAS_RCC_CK48MSEL              TRUE
+#define STM32_RCC_CK48MSEL_USES_I2S         TRUE
 
 /* ADC attributes.*/
 #define STM32_ADC_HANDLER                   Vector88
@@ -1561,15 +1575,18 @@
 #endif /* defined(STM32F413xx) */
 
 /*===========================================================================*/
-/* STM32F412Cx, STM32F412Rx, STM32F412Vx, STM32F412Zx                        */
+/* STM32F412xx.                                                              */
 /*===========================================================================*/
 
 #if defined(STM32F412xx)
 
 /* Clock tree attributes.*/
-#define STM32_HAS_RCC_SAIPLL                FALSE
-#define STM32_HAS_RCC_I2CPLL                TRUE
+#define STM32_HAS_RCC_PLLSAI                FALSE
+#define STM32_HAS_RCC_PLLI2S                TRUE
+#define STM32_HAS_RCC_I2SSRC                FALSE
+#define STM32_HAS_RCC_I2SPLLSRC             TRUE
 #define STM32_HAS_RCC_CK48MSEL              TRUE
+#define STM32_RCC_CK48MSEL_USES_I2S         TRUE
 
 /* ADC attributes.*/
 #define STM32_ADC_HANDLER                   Vector88
@@ -1890,15 +1907,18 @@
 #endif /* defined(STM32F412xx) */
 
 /*===========================================================================*/
-/* STM32F411xC, STM32F411xE                                                  */
+/* STM32F411xx.                                                              */
 /*===========================================================================*/
 
 #if defined(STM32F411xx)
 
 /* Clock tree attributes.*/
-#define STM32_HAS_RCC_SAIPLL                FALSE
-#define STM32_HAS_RCC_I2CPLL                TRUE
+#define STM32_HAS_RCC_PLLSAI                FALSE
+#define STM32_HAS_RCC_PLLI2S                TRUE
+#define STM32_HAS_RCC_I2SSRC                TRUE
+#define STM32_HAS_RCC_I2SPLLSRC             FALSE
 #define STM32_HAS_RCC_CK48MSEL              FALSE
+#define STM32_RCC_CK48MSEL_USES_I2S         FALSE
 
 /* ADC attributes.*/
 #define STM32_ADC_HANDLER                   Vector88
@@ -2193,15 +2213,20 @@
 #endif /* defined(STM32F411xx) */
 
 /*===========================================================================*/
-/* STM32F410Cx, STM32F410Rx.                                                 */
+/* STM32F410xx.                                                              */
 /*===========================================================================*/
 
 #if defined(STM32F410xx)
 
 /* Clock tree attributes.*/
-#define STM32_HAS_RCC_SAIPLL                FALSE
-#define STM32_HAS_RCC_I2CPLL                FALSE
+#define STM32_HAS_RCC_PLLSAI                FALSE
+#define STM32_HAS_RCC_PLLI2S                FALSE
+#define STM32_HAS_RCC_CK48MSEL_I2S          FALSE
+#define STM32_HAS_RCC_CK48MSEL_SAI          FALSE
+#define STM32_HAS_RCC_I2SSRC                FALSE
+#define STM32_HAS_RCC_I2SPLLSRC             FALSE
 #define STM32_HAS_RCC_CK48MSEL              FALSE
+#define STM32_RCC_CK48MSEL_USES_I2S         FALSE
 
 /* ADC attributes.*/
 #define STM32_ADC_HANDLER                   Vector88
@@ -2465,16 +2490,21 @@
 #endif /* defined(STM32F410xx) */
 
 /*===========================================================================*/
-/* STM32F405xx, STM32F415xx, STM32F407xx, STM32F417xx, STM32F205xx           */
+/* STM32F405xx, STM32F415xx, STM32F407xx, STM32F417xx, STM32F205xx,          */
 /* STM32F215xx, STM32F207xx, STM32F217xx.                                    */
 /*===========================================================================*/
 
 #if defined(STM32F40_41xxx) || defined(STM32F2XX)
 
 /* Clock tree attributes.*/
-#define STM32_HAS_RCC_SAIPLL                FALSE
-#define STM32_HAS_RCC_I2CPLL                TRUE
+#define STM32_HAS_RCC_PLLSAI                FALSE
+#define STM32_HAS_RCC_PLLI2S                TRUE
+#define STM32_HAS_RCC_CK48MSEL_I2S          FALSE
+#define STM32_HAS_RCC_CK48MSEL_SAI          FALSE
+#define STM32_HAS_RCC_I2SSRC                TRUE
+#define STM32_HAS_RCC_I2SPLLSRC             FALSE
 #define STM32_HAS_RCC_CK48MSEL              FALSE
+#define STM32_RCC_CK48MSEL_USES_I2S         FALSE
 
 /* ADC attributes.*/
 #define STM32_ADC_HANDLER                   Vector88
@@ -2820,9 +2850,12 @@
 #if defined(STM32F401xx)
 
 /* Clock tree attributes.*/
-#define STM32_HAS_RCC_SAIPLL                FALSE
-#define STM32_HAS_RCC_I2CPLL                FALSE
+#define STM32_HAS_RCC_PLLSAI                FALSE
+#define STM32_HAS_RCC_PLLI2S                FALSE
+#define STM32_HAS_RCC_I2SSRC                FALSE
+#define STM32_HAS_RCC_I2SPLLSRC             FALSE
 #define STM32_HAS_RCC_CK48MSEL              FALSE
+#define STM32_RCC_CK48MSEL_USES_I2S         FALSE
 
 /* ADC attributes.*/
 #define STM32_ADC_HANDLER                   Vector88
-- 
cgit v1.2.3