michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: spi: mchp_mss_qspi: Migrate spi_context_{complete,lock} usage

Browse source 
This commit updates the Microchip MSS QSPI SPI driver to reflect the
`spi_context_complete` and `spi_context_lock` function signature
changes introduced in the commit
4c20403629.

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
This commit is contained in:
Stephanos Ioannidis 2022-08-31 22:23:14 +09:00
commit da570f871f
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/spi/spi_mchp_mss_qspi.c
View file

@ -445,7 +445,7 @@ static void mss_qspi_interrupt(const struct device *dev)
if ((intfield & MSS_QSPI_IEN_RXDONE)) { if ((intfield & MSS_QSPI_IEN_RXDONE)) {
mss_qspi_write(cfg, MSS_QSPI_IEN_RXDONE, MSS_QSPI_REG_STATUS); mss_qspi_write(cfg, MSS_QSPI_IEN_RXDONE, MSS_QSPI_REG_STATUS);
spi_context_complete(ctx, 0); spi_context_complete(ctx, dev, 0);
} }
if (intfield & MSS_QSPI_IEN_TXAVAILABLE) { if (intfield & MSS_QSPI_IEN_TXAVAILABLE) {
@ -497,14 +497,16 @@ static int mss_qspi_transceive(const struct device *dev,
const struct spi_config *spi_cfg, const struct spi_config *spi_cfg,
const struct spi_buf_set *tx_bufs, const struct spi_buf_set *tx_bufs,
const struct spi_buf_set *rx_bufs, const struct spi_buf_set *rx_bufs,
bool async, struct k_poll_signal *sig) bool async,
spi_callback_t cb,
void *userdata)
{ {
const struct mss_qspi_config *config = dev->config; const struct mss_qspi_config *config = dev->config;
struct mss_qspi_data *data = dev->data; struct mss_qspi_data *data = dev->data;
struct spi_context *ctx = &data->ctx; struct spi_context *ctx = &data->ctx;
int ret = 0; int ret = 0;
spi_context_lock(ctx, async, sig, spi_cfg); spi_context_lock(ctx, async, cb, userdata, spi_cfg);
ret = mss_qspi_configure(dev, spi_cfg); ret = mss_qspi_configure(dev, spi_cfg);
if (ret) { if (ret) {
goto out; goto out;
@ -528,7 +530,7 @@ static int mss_qspi_transceive_blocking(const struct device *dev,
const struct spi_buf_set *rx_bufs) const struct spi_buf_set *rx_bufs)
{ {
return mss_qspi_transceive(dev, spi_cfg, tx_bufs, rx_bufs, false, return mss_qspi_transceive(dev, spi_cfg, tx_bufs, rx_bufs, false,
NULL); NULL, NULL);
} }
#ifdef CONFIG_SPI_ASYNC #ifdef CONFIG_SPI_ASYNC
@ -536,10 +538,11 @@ static int mss_qspi_transceive_async(const struct device *dev,
const struct spi_config *spi_cfg, const struct spi_config *spi_cfg,
const struct spi_buf_set *tx_bufs, const struct spi_buf_set *tx_bufs,
const struct spi_buf_set *rx_bufs, const struct spi_buf_set *rx_bufs,
struct k_poll_signal *async) spi_callback_t cb,
void *userdata)
{ {
return mss_qspi_transceive(dev, spi_cfg, tx_bufs, rx_bufs, true, return mss_qspi_transceive(dev, spi_cfg, tx_bufs, rx_bufs, true,
async); cb, userdata);
} }
#endif /* CONFIG_SPI_ASYNC */ #endif /* CONFIG_SPI_ASYNC */