Merge remote-tracking branches 'spi/fix/fsl-cpm', 'spi/fix/fsl-dspi' and 'spi/fix...

diff --combined drivers/spi/Kconfig
index a132180a925169fc468948261a05ec07e3d8357f,ab8dfbef6f1bb681a9ff14ca1e7ca09749b6a199,d63719ceed4557341fee65c428260a86cce1bfbf,ab8dfbef6f1bb681a9ff14ca1e7ca09749b6a199..72b059081559356100aa68dea2c021b056b492e5
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
--- 4/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@ -78,7 -78,6 -78,6 -78,6 +78,7 @@@@@ config SPI_ATME
    config SPI_BCM2835
        tristate "BCM2835 SPI controller"
        depends on ARCH_BCM2835 || COMPILE_TEST
 +++    depends on GPIOLIB
        help
          This selects a driver for the Broadcom BCM2835 SPI master.
    
@@@@@ -160,9 -159,10 -159,10 -159,10 +160,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"
@@@@@ -303,7 -303,7 -303,7 -303,7 +303,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.
@@@@@ -632,7 -632,7 -632,7 -632,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"