drivers: spi : driver with DMA for the stm32u5

This commit is the adaptation of the stm32 SPI driver with DMA
transfer for the stm32u5 soc.
Use the DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_spi)
also valid for the stm32U5 serie.

Signed-off-by: Francois Ramu <francois.ramu@st.com>
This commit is contained in:
Francois Ramu 2022-05-04 15:28:13 +02:00 committed by Carles Cufí
parent 99ab3fba54
commit 86ede2b679
2 changed files with 27 additions and 23 deletions

View file

@ -730,7 +730,7 @@ static int transceive_dma(const struct device *dev,
/* Set buffers info */
spi_context_buffers_setup(&data->ctx, tx_bufs, rx_bufs, 1);
#if defined(CONFIG_SOC_SERIES_STM32H7X)
#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_spi)
/* set request before enabling (else SPI CFG1 reg is write protected) */
LL_SPI_EnableDMAReq_RX(spi);
LL_SPI_EnableDMAReq_TX(spi);
@ -741,7 +741,7 @@ static int transceive_dma(const struct device *dev,
}
#else
LL_SPI_Enable(spi);
#endif /* CONFIG_SOC_SERIES_STM32H7X */
#endif /* st_stm32h7_spi */
/* This is turned off in spi_stm32_complete(). */
spi_stm32_cs_control(dev, true);
@ -764,11 +764,12 @@ static int transceive_dma(const struct device *dev,
break;
}
#if !defined(CONFIG_SOC_SERIES_STM32H7X)
#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_spi)
/* toggle the DMA request to restart the transfer */
LL_SPI_EnableDMAReq_RX(spi);
LL_SPI_EnableDMAReq_TX(spi);
#endif /* ! CONFIG_SOC_SERIES_STM32H7X */
#endif /* ! st_stm32h7_spi */
ret = wait_dma_rx_tx_done(dev);
if (ret != 0) {
@ -784,11 +785,11 @@ static int transceive_dma(const struct device *dev,
while (ll_func_spi_dma_busy(spi) == 0) {
}
#if !defined(CONFIG_SOC_SERIES_STM32H7X)
#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_spi)
/* toggle the DMA transfer request */
LL_SPI_DisableDMAReq_TX(spi);
LL_SPI_DisableDMAReq_RX(spi);
#endif /* ! CONFIG_SOC_SERIES_STM32H7X */
#endif /* ! st_stm32h7_spi */
spi_context_update_tx(&data->ctx, 1, dma_len);
spi_context_update_rx(&data->ctx, 1, dma_len);
@ -914,6 +915,9 @@ static int spi_stm32_init(const struct device *dev)
LOG_ERR("%s device not ready", data->dma_tx.dma_dev->name);
return -ENODEV;
}
LOG_INF(" SPI with DMA transfer");
#endif /* CONFIG_SPI_STM32_DMA */
err = spi_context_cs_configure_all(&data->ctx);

View file

@ -62,13 +62,13 @@ struct spi_stm32_data {
volatile uint32_t status_flags;
struct stream dma_rx;
struct stream dma_tx;
#endif
#endif /* CONFIG_SPI_STM32_DMA */
};
#ifdef CONFIG_SPI_STM32_DMA
static inline uint32_t ll_func_dma_get_reg_addr(SPI_TypeDef *spi, uint32_t location)
{
#if defined(CONFIG_SOC_SERIES_STM32H7X)
#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_spi)
if (location == SPI_STM32_DMA_TX) {
/* use direct register location until the LL_SPI_DMA_GetTxRegAddr exists */
return (uint32_t)&(spi->TXDR);
@ -78,7 +78,7 @@ static inline uint32_t ll_func_dma_get_reg_addr(SPI_TypeDef *spi, uint32_t locat
#else
ARG_UNUSED(location);
return (uint32_t)LL_SPI_DMA_GetRegAddr(spi);
#endif /* CONFIG_SOC_SERIES_STM32H7X */
#endif /* st_stm32h7_spi */
}
/* checks that DMA Tx packet is fully transmitted over the SPI */
@ -90,7 +90,7 @@ static inline uint32_t ll_func_spi_dma_busy(SPI_TypeDef *spi)
/* the SPI Tx empty and busy flags are needed */
return (LL_SPI_IsActiveFlag_TXE(spi) &&
!LL_SPI_IsActiveFlag_BSY(spi));
#endif
#endif /* LL_SPI_SR_TXC */
}
#endif /* CONFIG_SPI_STM32_DMA */
@ -100,7 +100,7 @@ static inline uint32_t ll_func_tx_is_empty(SPI_TypeDef *spi)
return LL_SPI_IsActiveFlag_TXP(spi);
#else
return LL_SPI_IsActiveFlag_TXE(spi);
#endif
#endif /* st_stm32h7_spi */
}
static inline uint32_t ll_func_rx_is_not_empty(SPI_TypeDef *spi)
@ -109,7 +109,7 @@ static inline uint32_t ll_func_rx_is_not_empty(SPI_TypeDef *spi)
return LL_SPI_IsActiveFlag_RXP(spi);
#else
return LL_SPI_IsActiveFlag_RXNE(spi);
#endif
#endif /* st_stm32h7_spi */
}
static inline void ll_func_enable_int_tx_empty(SPI_TypeDef *spi)
@ -118,7 +118,7 @@ static inline void ll_func_enable_int_tx_empty(SPI_TypeDef *spi)
LL_SPI_EnableIT_TXP(spi);
#else
LL_SPI_EnableIT_TXE(spi);
#endif
#endif /* st_stm32h7_spi */
}
static inline void ll_func_enable_int_rx_not_empty(SPI_TypeDef *spi)
@ -127,7 +127,7 @@ static inline void ll_func_enable_int_rx_not_empty(SPI_TypeDef *spi)
LL_SPI_EnableIT_RXP(spi);
#else
LL_SPI_EnableIT_RXNE(spi);
#endif
#endif /* st_stm32h7_spi */
}
static inline void ll_func_enable_int_errors(SPI_TypeDef *spi)
@ -140,7 +140,7 @@ static inline void ll_func_enable_int_errors(SPI_TypeDef *spi)
LL_SPI_EnableIT_MODF(spi);
#else
LL_SPI_EnableIT_ERR(spi);
#endif
#endif /* st_stm32h7_spi */
}
static inline void ll_func_disable_int_tx_empty(SPI_TypeDef *spi)
@ -149,7 +149,7 @@ static inline void ll_func_disable_int_tx_empty(SPI_TypeDef *spi)
LL_SPI_DisableIT_TXP(spi);
#else
LL_SPI_DisableIT_TXE(spi);
#endif
#endif /* st_stm32h7_spi */
}
static inline void ll_func_disable_int_rx_not_empty(SPI_TypeDef *spi)
@ -158,7 +158,7 @@ static inline void ll_func_disable_int_rx_not_empty(SPI_TypeDef *spi)
LL_SPI_DisableIT_RXP(spi);
#else
LL_SPI_DisableIT_RXNE(spi);
#endif
#endif /* st_stm32h7_spi */
}
static inline void ll_func_disable_int_errors(SPI_TypeDef *spi)
@ -171,7 +171,7 @@ static inline void ll_func_disable_int_errors(SPI_TypeDef *spi)
LL_SPI_DisableIT_MODF(spi);
#else
LL_SPI_DisableIT_ERR(spi);
#endif
#endif /* st_stm32h7_spi */
}
static inline uint32_t ll_func_spi_is_busy(SPI_TypeDef *spi)
@ -180,7 +180,7 @@ static inline uint32_t ll_func_spi_is_busy(SPI_TypeDef *spi)
return LL_SPI_IsActiveFlag_EOT(spi);
#else
return LL_SPI_IsActiveFlag_BSY(spi);
#endif
#endif /* st_stm32h7_spi */
}
/* Header is compiled first, this switch avoid the compiler to lookup for
@ -193,7 +193,7 @@ static inline void ll_func_set_fifo_threshold_8bit(SPI_TypeDef *spi)
LL_SPI_SetFIFOThreshold(spi, LL_SPI_FIFO_TH_01DATA);
#else
LL_SPI_SetRxFIFOThreshold(spi, LL_SPI_RX_FIFO_TH_QUARTER);
#endif
#endif /* st_stm32h7_spi */
}
static inline void ll_func_set_fifo_threshold_16bit(SPI_TypeDef *spi)
@ -202,9 +202,9 @@ static inline void ll_func_set_fifo_threshold_16bit(SPI_TypeDef *spi)
LL_SPI_SetFIFOThreshold(spi, LL_SPI_FIFO_TH_02DATA);
#else
LL_SPI_SetRxFIFOThreshold(spi, LL_SPI_RX_FIFO_TH_HALF);
#endif
#endif /* st_stm32h7_spi */
}
#endif
#endif /* st_stm32_spi_fifo */
static inline void ll_func_disable_spi(SPI_TypeDef *spi)
{
@ -228,7 +228,7 @@ static inline void ll_func_disable_spi(SPI_TypeDef *spi)
LL_SPI_ClearFlag_SUSP(spi);
#else
LL_SPI_Disable(spi);
#endif
#endif /* st_stm32h7_spi */
}
#endif /* ZEPHYR_DRIVERS_SPI_SPI_LL_STM32_H_ */