From beef652b8946a5fbf4245a0c3a07a411247614ad Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 28 Oct 2018 16:52:55 +0000 Subject: Fixed a problem in L4+ PLLSAIx initialization, added options to mcuconf.h, updated mcuconf generator tool. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12397 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h | 15 +++++++++++++++ demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h | 15 +++++++++++++++ 2 files changed, 30 insertions(+) (limited to 'demos') diff --git a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h index 324bf6c70..b751de6ac 100644 --- a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h @@ -69,11 +69,13 @@ #define STM32_MCOSEL STM32_MCOSEL_NOCLOCK #define STM32_MCOPRE STM32_MCOPRE_DIV1 #define STM32_LSCOSEL STM32_LSCOSEL_NOCLOCK +#define STM32_PLLSAI1M_VALUE 1 #define STM32_PLLSAI1N_VALUE 72 #define STM32_PLLSAI1PDIV_VALUE 6 #define STM32_PLLSAI1P_VALUE 7 #define STM32_PLLSAI1Q_VALUE 6 #define STM32_PLLSAI1R_VALUE 6 +#define STM32_PLLSAI2M_VALUE 1 #define STM32_PLLSAI2N_VALUE 72 #define STM32_PLLSAI2PDIV_VALUE 6 #define STM32_PLLSAI2P_VALUE 7 @@ -321,5 +323,18 @@ /* * WSPI driver system settings. */ +#define STM32_WSPI_USE_OCTOSPI1 TRUE +#define STM32_WSPI_USE_OCTOSPI2 TRUE +#define STM32_WSPI_OCTOSPI1_PRESCALER_VALUE 1 +#define STM32_WSPI_OCTOSPI2_PRESCALER_VALUE 1 +#define STM32_WSPI_OCTOSPI1_IRQ_PRIORITY 10 +#define STM32_WSPI_OCTOSPI2_IRQ_PRIORITY 10 +#define STM32_WSPI_OCTOSPI1_DMA_CHANNEL 9 +#define STM32_WSPI_OCTOSPI2_DMA_CHANNEL 10 +#define STM32_WSPI_OCTOSPI1_DMA_PRIORITY 1 +#define STM32_WSPI_OCTOSPI2_DMA_PRIORITY 1 +#define STM32_WSPI_OCTOSPI1_DMA_IRQ_PRIORITY 10 +#define STM32_WSPI_OCTOSPI2_DMA_IRQ_PRIORITY 10 +#define STM32_WSPI_DMA_ERROR_HOOK(qspip) osalSysHalt("DMA failure") #endif /* MCUCONF_H */ diff --git a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h index d84968c64..99336e8ac 100644 --- a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h @@ -69,11 +69,13 @@ #define STM32_MCOSEL STM32_MCOSEL_NOCLOCK #define STM32_MCOPRE STM32_MCOPRE_DIV1 #define STM32_LSCOSEL STM32_LSCOSEL_NOCLOCK +#define STM32_PLLSAI1M_VALUE 4 #define STM32_PLLSAI1N_VALUE 72 #define STM32_PLLSAI1PDIV_VALUE 6 #define STM32_PLLSAI1P_VALUE 7 #define STM32_PLLSAI1Q_VALUE 6 #define STM32_PLLSAI1R_VALUE 6 +#define STM32_PLLSAI2M_VALUE 4 #define STM32_PLLSAI2N_VALUE 72 #define STM32_PLLSAI2PDIV_VALUE 6 #define STM32_PLLSAI2P_VALUE 7 @@ -321,5 +323,18 @@ /* * WSPI driver system settings. */ +#define STM32_WSPI_USE_OCTOSPI1 TRUE +#define STM32_WSPI_USE_OCTOSPI2 TRUE +#define STM32_WSPI_OCTOSPI1_PRESCALER_VALUE 1 +#define STM32_WSPI_OCTOSPI2_PRESCALER_VALUE 1 +#define STM32_WSPI_OCTOSPI1_IRQ_PRIORITY 10 +#define STM32_WSPI_OCTOSPI2_IRQ_PRIORITY 10 +#define STM32_WSPI_OCTOSPI1_DMA_CHANNEL 9 +#define STM32_WSPI_OCTOSPI2_DMA_CHANNEL 10 +#define STM32_WSPI_OCTOSPI1_DMA_PRIORITY 1 +#define STM32_WSPI_OCTOSPI2_DMA_PRIORITY 1 +#define STM32_WSPI_OCTOSPI1_DMA_IRQ_PRIORITY 10 +#define STM32_WSPI_OCTOSPI2_DMA_IRQ_PRIORITY 10 +#define STM32_WSPI_DMA_ERROR_HOOK(qspip) osalSysHalt("DMA failure") #endif /* MCUCONF_H */ -- cgit v1.2.3