Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pl022', 'spi/topic/qup...

diff --cc Documentation/devicetree/bindings/spi/qcom,spi-qup.txt
Simple merge

diff --cc drivers/spi/Kconfig
index 213b5cbb9dccede248f7a02b08f1fb36c2980672,213b5cbb9dccede248f7a02b08f1fb36c2980672,213b5cbb9dccede248f7a02b08f1fb36c2980672,213b5cbb9dccede248f7a02b08f1fb36c2980672,79ace88030c4f97d1a2d70157a2c61d26fd5f71d,29630a99fecd18dccd999231eeb60df440f7cbea..20bd055ea2d16a16f7950c166e1a015d62ceb85c
--- 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
@@@@@@@ -382,9 -382,9 -382,9 -382,9 -382,21 -382,9 +382,21 @@@@@@@ config SPI_PXA2X
      config SPI_PXA2XX_PCI
        def_tristate SPI_PXA2XX && PCI
      
++++ +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.
++++ +
++++ +    If you say yes to this option, support will be included for
++++ +    RK3066, RK3188 and RK3288 families of SPI controller.
++++ +    Rockchip SPI controller support DMA transport and PIO mode.
++++ +    The main usecase of this controller is to use spi flash as boot
++++ +    device.
++++ +
      config SPI_RSPI
        tristate "Renesas RSPI/QSPI controller"
-----   depends on (SUPERH && SH_DMAE_BASE) || ARCH_SHMOBILE
+++++   depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
        help
          SPI driver for Renesas RSPI and QSPI blocks.
      

diff --cc drivers/spi/spi-orion.c
Simple merge

diff --cc drivers/spi/spi-qup.c
Simple merge