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

diff --combined drivers/spi/spi-imx.c
index e08646e715baa0a7e6a856191825d1a0a131ecbe,a81ae29aa68a9f90b18ba01d27128bc5eb6aa15d..09c9a1edb2c6d285c772d70d9904267702bcd920
--- 1/drivers/spi/spi-imx.c
--- 2/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@@ -28,10 -28,6 +28,10 @@@
  
  #define DRIVER_NAME "spi_imx"
  
 +static bool use_dma = true;
 +module_param(use_dma, bool, 0644);
 +MODULE_PARM_DESC(use_dma, "Enable usage of DMA when available (default)");
 +
  #define MXC_CSPIRXDATA                0x00
  #define MXC_CSPITXDATA                0x04
  #define MXC_CSPICTRL          0x08
@@@ -223,9 -219,6 +223,9 @@@ static bool spi_imx_can_dma(struct spi_
  {
        struct spi_imx_data *spi_imx = spi_master_get_devdata(master);
  
 +      if (!use_dma)
 +              return false;
 +
        if (!master->dma_rx)
                return false;
  
@@@ -1501,7 -1494,7 +1501,7 @@@ static int spi_imx_transfer(struct 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);