From 1c00f368d951d7784a12d8142e68321f6f93bba9 Mon Sep 17 00:00:00 2001 From: Declan Snyder Date: Tue, 18 Feb 2025 09:55:04 -0600 Subject: [PATCH] spi_nxp_lpspi: Convert DMA version to native code Convert the DMA-based LPSPI driver to native code. Signed-off-by: Declan Snyder --- drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c index 6fbe031e518..7b3f34645ab 100644 --- a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c +++ b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c @@ -64,8 +64,7 @@ static int spi_mcux_dma_tx_load(const struct device *dev, const uint8_t *buf, si stream->dma_cfg.channel_direction = MEMORY_TO_PERIPHERAL; } - /* Dest is always LPSPI tx fifo */ - blk_cfg->dest_address = LPSPI_GetTxRegisterAddress(base); + blk_cfg->dest_address = (uint32_t) &(base->TDR); return dma_config(stream->dma_dev, stream->channel, &stream->dma_cfg); } @@ -87,7 +86,7 @@ static int spi_mcux_dma_rx_load(const struct device *dev, uint8_t *buf, size_t l blk_cfg->dest_address = (uint32_t)buf; } - blk_cfg->source_address = LPSPI_GetRxRegisterAddress(base); + blk_cfg->source_address = (uint32_t) &(base->RDR); return dma_config(stream->dma_dev, stream->channel, &stream->dma_cfg); } @@ -180,8 +179,10 @@ static void spi_mcux_dma_callback(const struct device *dev, void *arg, uint32_t return; } - while ((IS_ENABLED(CONFIG_SOC_FAMILY_NXP_IMXRT) || IS_ENABLED(CONFIG_SOC_FAMILY_KINETIS)) && - (LPSPI_GetStatusFlags(base) & kLPSPI_ModuleBusyFlag)) { + + while ((IS_ENABLED(CONFIG_SOC_FAMILY_NXP_IMXRT) || + IS_ENABLED(CONFIG_SOC_FAMILY_KINETIS)) && + (base->SR & LPSPI_SR_MBF_MASK)) { /* wait until module is idle */ } @@ -198,11 +199,11 @@ static void spi_mcux_dma_callback(const struct device *dev, void *arg, uint32_t error: LOG_ERR("DMA callback error with channel %d err %d.", channel, status); done: - LPSPI_DisableDMA(base, kLPSPI_TxDmaEnable | kLPSPI_RxDmaEnable); + base->DER &= ~(LPSPI_DER_TDDE_MASK | LPSPI_DER_RDDE_MASK); base->TCR &= ~LPSPI_TCR_CONT_MASK; lpspi_wait_tx_fifo_empty(spi_dev); spi_context_cs_control(ctx, false); - LPSPI_FlushFifo(base, true, true); + base->CR |= LPSPI_CR_RTF_MASK | LPSPI_CR_RRF_MASK; spi_context_complete(ctx, spi_dev, status); spi_context_release(ctx, status); } @@ -240,9 +241,9 @@ static int transceive_dma(const struct device *dev, const struct spi_config *spi spi_context_cs_control(ctx, true); - LPSPI_FlushFifo(base, true, true); + base->CR |= LPSPI_CR_RTF_MASK | LPSPI_CR_RRF_MASK; - LPSPI_EnableDMA(base, kLPSPI_TxDmaEnable | kLPSPI_RxDmaEnable); + base->DER |= LPSPI_DER_TDDE_MASK | LPSPI_DER_RDDE_MASK; ret = spi_context_wait_for_completion(ctx); if (ret >= 0) {