sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in david_s5/nuttx/master_h7 (pull request #1012)

Browse Source 
Master h7

* stm32h7:spi allow more clock sources

* stm32h7 has ARCH_HAVE_I2CRESET

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
David Sidrane 2019-08-20 14:41:13 +00:00 committed by Gregory Nutt
parent 0f6db4e1db
commit 64fb11c1b8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

@ -343,7 +343,7 @@ config ARCH_CHIP_STM32H7
bool "STMicro STM32 H7" bool "STMicro STM32 H7"
select ARCH_CORTEXM7 select ARCH_CORTEXM7
select ARCH_HAVE_MPU select ARCH_HAVE_MPU
# select ARCH_HAVE_I2CRESET select ARCH_HAVE_I2CRESET
# select ARCH_HAVE_HEAPCHECK # select ARCH_HAVE_HEAPCHECK
select ARCH_HAVE_SPI_BITORDER select ARCH_HAVE_SPI_BITORDER
select ARM_HAVE_MPU_UNIFIED select ARM_HAVE_MPU_UNIFIED

6
arch/arm/src/stm32h7/stm32_spi.c
View File

@ -147,6 +147,8 @@
defined(CONFIG_STM32H7_SPI3) defined(CONFIG_STM32H7_SPI3)
# if STM32_RCC_D2CCIP1R_SPI123SRC == RCC_D2CCIP1R_SPI123SEL_PLL1 # if STM32_RCC_D2CCIP1R_SPI123SRC == RCC_D2CCIP1R_SPI123SEL_PLL1
# define SPI123_KERNEL_CLOCK_FREQ STM32_PLL1Q_FREQUENCY # define SPI123_KERNEL_CLOCK_FREQ STM32_PLL1Q_FREQUENCY
# elif STM32_RCC_D2CCIP1R_SPI123SRC == RCC_D2CCIP1R_SPI123SEL_PLL2
# define SPI123_KERNEL_CLOCK_FREQ STM32_PLL2P_FREQUENCY
# else # else
# error Not supported yet # error Not supported yet
# endif # endif
@ -158,6 +160,8 @@
#if defined(CONFIG_STM32H7_SPI4) || defined(CONFIG_STM32H7_SPI5) #if defined(CONFIG_STM32H7_SPI4) || defined(CONFIG_STM32H7_SPI5)
# if STM32_RCC_D2CCIP1R_SPI45SRC == RCC_D2CCIP1R_SPI45SEL_APB # if STM32_RCC_D2CCIP1R_SPI45SRC == RCC_D2CCIP1R_SPI45SEL_APB
# define SPI45_KERNEL_CLOCK_FREQ STM32_PCLK2_FREQUENCY # define SPI45_KERNEL_CLOCK_FREQ STM32_PCLK2_FREQUENCY
# elif STM32_RCC_D2CCIP1R_SPI45SRC == RCC_D2CCIP1R_SPI45SEL_PLL2
# define SPI45_KERNEL_CLOCK_FREQ STM32_PLL2Q_FREQUENCY
# else # else
# error Not supported yet # error Not supported yet
# endif # endif
@ -169,6 +173,8 @@
#if defined(CONFIG_STM32H7_SPI6) #if defined(CONFIG_STM32H7_SPI6)
# if STM32_RCC_D3CCIPR_SPI6SRC == RCC_D3CCIPR_SPI6SEL_PCLK4 # if STM32_RCC_D3CCIPR_SPI6SRC == RCC_D3CCIPR_SPI6SEL_PCLK4
# define SPI6_KERNEL_CLOCK_FREQ STM32_PCLK4_FREQUENCY # define SPI6_KERNEL_CLOCK_FREQ STM32_PCLK4_FREQUENCY
# elif STM32_RCC_D3CCIPR_SPI6SRC == RCC_D3CCIPR_SPI6SEL_PLL2
# define SPI6_KERNEL_CLOCK_FREQ STM32_PLL2Q_FREQUENCY
# else # else
# error Not supported yet # error Not supported yet
# endif # endif