Merge remote-tracking branches 'spi/topic/pxa', 'spi/topic/rb4xx', 'spi/topic/rspi...

diff --combined drivers/spi/Kconfig
index 7183be8a3c921bd35df94d725ca4b2f4e9afd854,c82a3d128cc6a6e7026b5eb6479688bbaa1912aa,8b1beaf6c9e5ca71f845b1a148b04db48b1becbb,198f96b7fb45dab78845ba1fcde123ea680e2082,198f96b7fb45dab78845ba1fcde123ea680e2082,198f96b7fb45dab78845ba1fcde123ea680e2082..ec40a27a4b7642ad4ce489d9daa760f8b69dfe62
--- 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
@@@@@@@ -77,9 -77,7 -77,7 -77,7 -77,7 -77,7 +77,9 @@@@@@@ config SPI_ATME
      
      config SPI_BCM2835
        tristate "BCM2835 SPI controller"
 +++++  depends on GPIOLIB
        depends on ARCH_BCM2835 || COMPILE_TEST
 +++++  depends on GPIOLIB
        help
          This selects a driver for the Broadcom BCM2835 SPI master.
      
@@@@@@@ -161,9 -159,9 -159,10 -159,9 -159,9 -159,9 +161,9 @@@@@@@ config SPI_BUTTERFL
      
      config SPI_CADENCE
        tristate "Cadence SPI controller"
  -     depends on ARM
        help
          This selects the Cadence SPI controller master driver
  -       used by Xilinx Zynq.
  +       used by Xilinx Zynq and ZynqMP.
      
      config SPI_CLPS711X
        tristate "CLPS711X host SPI controller"
@@@@@@@ -222,7 -220,7 -221,7 -220,7 -220,7 -220,7 +222,7 @@@@@@@ config SPI_FALCO
      
      config SPI_GPIO
        tristate "GPIO-based bitbanging SPI Master"
 -----  depends on GPIOLIB
 +++++  depends on GPIOLIB || COMPILE_TEST
        select SPI_BITBANG
        help
          This simple GPIO bitbanging SPI master uses the arch-neutral GPIO
@@@@@@@ -304,7 -302,7 -303,7 -302,7 -302,7 -302,7 +304,7 @@@@@@@ config SPI_FSL_SP
      config SPI_FSL_DSPI
        tristate "Freescale DSPI controller"
        select REGMAP_MMIO
 -----  depends on SOC_VF610 || COMPILE_TEST
 +++++  depends on SOC_VF610 || SOC_LS1021A || COMPILE_TEST
        help
          This enables support for the Freescale DSPI controller in master
          mode. VF610 platform uses the controller.
@@@@@@@ -328,7 -326,7 -327,7 -326,7 -326,7 -326,7 +328,7 @@@@@@@ config SPI_MESON_SPIF
      
      config SPI_OC_TINY
        tristate "OpenCores tiny SPI"
 -----  depends on GPIOLIB
 +++++  depends on GPIOLIB || COMPILE_TEST
        select SPI_BITBANG
        help
          This is the driver for OpenCores tiny SPI master controller.
@@@@@@@ -395,16 -393,9 -394,16 -393,16 -393,16 -393,16 +395,9 @@@@@@@ config SPI_PPC4x
        help
          This selects a driver for the PPC4xx SPI Controller.
      
- ----config SPI_PXA2XX_PXADMA
- ----  bool "PXA2xx SSP legacy PXA DMA API support"
- ----  depends on SPI_PXA2XX && ARCH_PXA
- ----  help
- ----    Enable PXA private legacy DMA API support. Note that this is
- ----    deprecated in favor of generic DMA engine API.
- ----
      config SPI_PXA2XX_DMA
        def_bool y
- ----  depends on SPI_PXA2XX && !SPI_PXA2XX_PXADMA
+ ++++  depends on SPI_PXA2XX
      
      config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
@@@@@@@ -430,6 -421,6 -429,12 -428,6 -428,6 -428,6 +423,12 @@@@@@@ config SPI_ROCKCHI
          The main usecase of this controller is to use spi flash as boot
          device.
      
++ +++config SPI_RB4XX
++ +++  tristate "Mikrotik RB4XX SPI master"
++ +++  depends on SPI_MASTER && ATH79
++ +++  help
++ +++    SPI controller driver for the Mikrotik RB4xx series boards.
++ +++
      config SPI_RSPI
        tristate "Renesas RSPI/QSPI controller"
        depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
@@@@@@@ -633,7 -624,7 -638,7 -631,7 -631,7 -631,7 +632,7 @@@@@@@ config SPI_DW_PC
      
      config SPI_DW_MID_DMA
        bool "DMA support for DW SPI controller on Intel MID platform"
  -     depends on SPI_DW_PCI && INTEL_MID_DMAC
  +     depends on SPI_DW_PCI && DW_DMAC_PCI
      
      config SPI_DW_MMIO
        tristate "Memory-mapped io interface driver for DW SPI core"

diff --combined drivers/spi/Makefile
index d8cbf654976b5296aaa7561eeef6ba480631eb4f,11df16016d8f2838a967764fb055f2a4ae142458,0218f39de7d2465517f25ea182ea5de8499157f8,d8cbf654976b5296aaa7561eeef6ba480631eb4f,d8cbf654976b5296aaa7561eeef6ba480631eb4f,d8cbf654976b5296aaa7561eeef6ba480631eb4f..2e7089fbc799906221454a347da71fdfc1206135
--- 1/drivers/spi/Makefile
--- 2/drivers/spi/Makefile
--- 3/drivers/spi/Makefile
--- 4/drivers/spi/Makefile
--- 5/drivers/spi/Makefile
--- 6/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@@@@@ -60,12 -60,11 -60,13 -60,12 -60,12 -60,12 +60,12 @@@@@@@ obj-$(CONFIG_SPI_ORION)                        += spi-orion.
      obj-$(CONFIG_SPI_PL022)                   += spi-pl022.o
      obj-$(CONFIG_SPI_PPC4xx)          += spi-ppc4xx.o
      spi-pxa2xx-platform-objs          := spi-pxa2xx.o
- ----spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_PXADMA)   += spi-pxa2xx-pxadma.o
      spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA)      += spi-pxa2xx-dma.o
      obj-$(CONFIG_SPI_PXA2XX)          += spi-pxa2xx-platform.o
      obj-$(CONFIG_SPI_PXA2XX_PCI)              += spi-pxa2xx-pci.o
      obj-$(CONFIG_SPI_QUP)                     += spi-qup.o
      obj-$(CONFIG_SPI_ROCKCHIP)                += spi-rockchip.o
++ +++obj-$(CONFIG_SPI_RB4XX)                   += spi-rb4xx.o
      obj-$(CONFIG_SPI_RSPI)                    += spi-rspi.o
      obj-$(CONFIG_SPI_S3C24XX)         += spi-s3c24xx-hw.o
      spi-s3c24xx-hw-y                  := spi-s3c24xx.o