Skip to content

NXP LPSPI: Some bug fixes to the interrupt-based driver #86889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 14, 2025
Merged

NXP LPSPI: Some bug fixes to the interrupt-based driver #86889

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cead93d
spi_nxp_lpspi: Fix TX word formation for multibyte
decsny Mar 10, 2025
dca05cf
spi_nxp_lpspi: Fix resource leak in transceive
decsny Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static inline uint32_t lpspi_next_tx_word(const struct device *dev, int offset)
uint32_t next_word = 0;

for (uint8_t i = 0; i < num_bytes; i++) {
next_word |= *byte << (BITS_PER_BYTE * i);
next_word |= byte[i] << (BITS_PER_BYTE * i);
}

return next_word;
Expand Down Expand Up @@ -238,30 +238,31 @@ static int transceive(const struct device *dev, const struct spi_config *spi_cfg
LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
struct spi_mcux_data *data = dev->data;
struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
int ret;
struct spi_context *ctx = &data->ctx;
int ret = 0;

spi_context_lock(&data->ctx, asynchronous, cb, userdata, spi_cfg);

lpspi_data->word_size_bytes = SPI_WORD_SIZE_GET(spi_cfg->operation) / BITS_PER_BYTE;
if (lpspi_data->word_size_bytes > 4) {
LOG_ERR("Maximum 4 byte word size");
ret = -EINVAL;
return ret;
goto error;
}

spi_context_buffers_setup(&data->ctx, tx_bufs, rx_bufs, lpspi_data->word_size_bytes);
spi_context_buffers_setup(ctx, tx_bufs, rx_bufs, lpspi_data->word_size_bytes);

ret = spi_mcux_configure(dev, spi_cfg);
if (ret) {
return ret;
goto error;
}

LPSPI_FlushFifo(base, true, true);
LPSPI_ClearStatusFlags(base, (uint32_t)kLPSPI_AllStatusFlag);
LPSPI_DisableInterrupts(base, (uint32_t)kLPSPI_AllInterruptEnable);

LOG_DBG("Starting LPSPI transfer");
spi_context_cs_control(&data->ctx, true);
spi_context_cs_control(ctx, true);

LPSPI_SetFifoWatermarks(base, 0, 0);
LPSPI_Enable(base, true);
Expand All @@ -277,7 +278,11 @@ static int transceive(const struct device *dev, const struct spi_config *spi_cfg
LPSPI_EnableInterrupts(base, (uint32_t)kLPSPI_TxInterruptEnable |
(uint32_t)kLPSPI_RxInterruptEnable);

return spi_context_wait_for_completion(&data->ctx);
return spi_context_wait_for_completion(ctx);

error:
spi_context_release(ctx, ret);
return ret;
}

static int spi_mcux_transceive_sync(const struct device *dev, const struct spi_config *spi_cfg,
Expand Down
Loading