Commit 301c8949 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A few more small driver specific fixes"

* tag 'spi-fix-v5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: spi-rspi: Fix PIO fallback on RZ platforms
  spi: spi-cadence: Fix SPI NO Slave Select macro definition
  spi: bcm2835: bcm2835_spi_handle_err(): fix NULL pointer deref for non DMA transfers
parents 70664fc1 b620aa3a

drivers/spi/spi-bcm2835.c

+8 −4
Original line number Diff line number Diff line
@@ -1138,10 +1138,14 @@ static void bcm2835_spi_handle_err(struct spi_controller *ctlr, 
	struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);



	/* if an error occurred and we have an active dma, then terminate */

	if (ctlr->dma_tx) {

		dmaengine_terminate_sync(ctlr->dma_tx);

		bs->tx_dma_active = false;

	}

	if (ctlr->dma_rx) {

		dmaengine_terminate_sync(ctlr->dma_rx);

		bs->rx_dma_active = false;

	}

	bcm2835_spi_undo_prologue(bs);



	/* and reset */

drivers/spi/spi-cadence.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
#define CDNS_SPI_BAUD_DIV_SHIFT		3 /* Baud rate divisor shift in CR */

#define CDNS_SPI_SS_SHIFT		10 /* Slave Select field shift in CR */

#define CDNS_SPI_SS0			0x1 /* Slave Select zero */

#define CDNS_SPI_NOSS			0x3C /* No Slave select */

#define CDNS_SPI_NOSS			0xF /* No Slave select */



/*

 * SPI Interrupt Registers bit Masks

drivers/spi/spi-rspi.c

+4 −0
Original line number Diff line number Diff line
@@ -613,6 +613,10 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, 
					       rspi->dma_callbacked, HZ);

	if (ret > 0 && rspi->dma_callbacked) {

		ret = 0;

		if (tx)

			dmaengine_synchronize(rspi->ctlr->dma_tx);

		if (rx)

			dmaengine_synchronize(rspi->ctlr->dma_rx);

	} else {

		if (!ret) {

			dev_err(&rspi->ctlr->dev, "DMA timeout\n");