Merge branch 'spi-5.1' into spi-5.2 for stm32

2019-03-15 17:06:34 +00:00
parent 6d85028134 5356c2c70e
commit 3949ba3b37
4 changed files with 26 additions and 30 deletions
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1501,7 +1501,7 @@ static int spi_imx_transfer(struct spi_device *spi,

 	/* flush rxfifo before transfer */
 	while (spi_imx->devtype_data->rx_available(spi_imx))
-		spi_imx->rx(spi_imx);
+		readl(spi_imx->base + MXC_CSPIRXDATA);

 	if (spi_imx->slave_mode)
 		return spi_imx_pio_transfer_slave(spi, transfer);