Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qup', 'spi/topic/rockch...

diff --combined drivers/spi/Kconfig
index b189508ccf92c53e6908f1722c572f55074f3438,9d8c84bb15446a75153d64f94a5900ab165193ac,9d8c84bb15446a75153d64f94a5900ab165193ac,9d8c84bb15446a75153d64f94a5900ab165193ac,06190890a60e1065657f1e1672ff7fd38d32ac36,6536068ce74f9a733d18774c18e7de95e4761fa4..4b931ec8d90b610f498a3e317e0523e9d1aa6900
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
--- 4/drivers/spi/Kconfig
--- 5/drivers/spi/Kconfig
--- 6/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@@@ -410,6 -410,7 -410,7 -410,7 -410,7 -410,7 +410,6 @@@@@@@ config SPI_OMAP_UWIR
      config SPI_OMAP24XX
        tristate "McSPI driver for OMAP"
        depends on HAS_DMA
 -----  depends on ARM || ARM64 || AVR32 || HEXAGON || MIPS || SUPERH
        depends on ARCH_OMAP2PLUS || COMPILE_TEST
        help
          SPI master controller for OMAP24XX and later Multichannel SPI
@@@@@@@ -431,23 -432,10 -432,10 -432,10 -432,10 -432,10 +431,23 @@@@@@@ config SPI_OMAP_100
      
      config SPI_ORION
        tristate "Orion SPI master"
 -----  depends on PLAT_ORION || COMPILE_TEST
 +++++  depends on PLAT_ORION || ARCH_MVEBU || COMPILE_TEST
        help
          This enables using the SPI master controller on the Orion chips.
      
 +++++config SPI_PIC32
 +++++  tristate "Microchip PIC32 series SPI"
 +++++  depends on MACH_PIC32 || COMPILE_TEST
 +++++  help
 +++++    SPI driver for Microchip PIC32 SPI master controller.
 +++++
 +++++config SPI_PIC32_SQI
 +++++  tristate "Microchip PIC32 Quad SPI driver"
 +++++  depends on MACH_PIC32 || COMPILE_TEST
 +++++  depends on HAS_DMA
 +++++  help
 +++++    SPI driver for PIC32 Quad SPI controller.
 +++++
      config SPI_PL022
        tristate "ARM AMBA PL022 SSP controller"
        depends on ARM_AMBA
@@@@@@@ -481,6 -469,7 -469,7 -469,7 -469,7 -469,7 +481,6 @@@@@@@ config SPI_PXA2XX_PC
      
      config SPI_ROCKCHIP
        tristate "Rockchip SPI controller driver"
 -----  depends on ARM || ARM64 || AVR32 || HEXAGON || MIPS || SUPERH
        help
          This selects a driver for Rockchip SPI controller.
      
@@@@@@@ -580,7 -569,7 -569,7 -569,7 -569,7 -569,7 +580,7 @@@@@@@ config SPI_SIR
      
      config SPI_ST_SSC4
        tristate "STMicroelectronics SPI SSC-based driver"
---- -  depends on ARCH_STI
++++ +  depends on ARCH_STI || COMPILE_TEST
        help
          STMicroelectronics SoCs support for SPI. If you say yes to
          this option, support will be included for the SSC driven SPI.
@@@@@@@ -667,7 -656,7 -656,7 -656,7 -656,7 -656,7 +667,7 @@@@@@@ config SPI_XILIN
      
      config SPI_XLP
        tristate "Netlogic XLP SPI controller driver"
-----   depends on CPU_XLP || COMPILE_TEST
+++++   depends on CPU_XLP || ARCH_VULCAN || COMPILE_TEST
        help
          Enable support for the SPI controller on the Netlogic XLP SoCs.
          Currently supported XLP variants are XLP8XX, XLP3XX, XLP2XX, XLP9XX

diff --combined drivers/spi/spi-pxa2xx.c
index dbcc036877c813706bc155b201c4968cc51cf0db,0ce82db8e484f2471f117d1123d4481e44a64c1e,85e59a406a4c01fabef55679c5ffb9b9583bd852,85e59a406a4c01fabef55679c5ffb9b9583bd852,85e59a406a4c01fabef55679c5ffb9b9583bd852,85e59a406a4c01fabef55679c5ffb9b9583bd852..fe07c0592b44c9eac5faf22409203392cdbc9e3a
--- 1/drivers/spi/spi-pxa2xx.c
--- 2/drivers/spi/spi-pxa2xx.c
--- 3/drivers/spi/spi-pxa2xx.c
--- 4/drivers/spi/spi-pxa2xx.c
--- 5/drivers/spi/spi-pxa2xx.c
--- 6/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@@@@@@ -126,7 -126,7 -126,7 -126,7 -126,7 -126,7 +126,7 @@@@@@@ static const struct lpss_config lpss_pl
                .reg_general = -1,
                .reg_ssp = 0x20,
                .reg_cs_ctrl = 0x24,
 -----          .reg_capabilities = 0xfc,
 +++++          .reg_capabilities = -1,
                .rx_threshold = 1,
                .tx_threshold_lo = 32,
                .tx_threshold_hi = 56,
@@@@@@@ -570,9 -570,8 -570,9 -570,9 -570,9 -570,9 +570,8 @@@@@@@ static void giveback(struct driver_dat
                /* see if the next and current messages point
                 * to the same chip
                 */
- ----          if (next_msg && next_msg->spi != msg->spi)
- ----                  next_msg = NULL;
- ----          if (!next_msg || msg->state == ERROR_STATE)
+ ++++          if ((next_msg && next_msg->spi != msg->spi) ||
+ ++++              msg->state == ERROR_STATE)
                        cs_deassert(drv_data);
        }
      
@@@@@@@ -928,6 -927,7 -928,6 -928,6 -928,6 -928,6 +927,7 @@@@@@@ static void pump_transfers(unsigned lon
        u32 dma_thresh = drv_data->cur_chip->dma_threshold;
        u32 dma_burst = drv_data->cur_chip->dma_burst_size;
        u32 change_mask = pxa2xx_spi_get_ssrc1_change_mask(drv_data);
+ ++++  int err;
      
        /* Get current state information */
        message = drv_data->cur_msg;
@@@@@@@ -1047,7 -1047,12 -1047,7 -1047,7 -1047,7 -1047,7 +1047,12 @@@@@@@
                /* Ensure we have the correct interrupt handler */
                drv_data->transfer_handler = pxa2xx_spi_dma_transfer;
      
- ----          pxa2xx_spi_dma_prepare(drv_data, dma_burst);
+ ++++          err = pxa2xx_spi_dma_prepare(drv_data, dma_burst);
+ ++++          if (err) {
+ ++++                  message->status = err;
+ ++++                  giveback(drv_data);
+ ++++                  return;
+ ++++          }
      
                /* Clear status and start DMA engine */
                cr1 = chip->cr1 | dma_thresh | drv_data->dma_cr1;
@@@@@@@ -1543,6 -1548,7 -1543,7 -1543,7 -1543,7 -1543,7 +1548,6 @@@@@@@ static int pxa2xx_spi_probe(struct plat
        drv_data->pdev = pdev;
        drv_data->ssp = ssp;
      
 -----  master->dev.parent = &pdev->dev;
        master->dev.of_node = pdev->dev.of_node;
        /* the spi->mode bits understood by this driver: */
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;
@@@@@@@ -1555,6 -1561,7 -1556,6 -1556,6 -1556,6 -1556,6 +1560,7 @@@@@@@
        master->unprepare_transfer_hardware = pxa2xx_spi_unprepare_transfer;
        master->fw_translate_cs = pxa2xx_spi_fw_translate_cs;
        master->auto_runtime_pm = true;
+ ++++  master->flags = SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX;
      
        drv_data->ssp_type = ssp->type;