Merge remote-tracking branch 'spi/topic/davinci' into spi-next

diff --combined drivers/spi/Kconfig
index f3cc865df17bcb4d79e38f82274c61a0bca410c8,3858d6605518535516c059a5fdc98289e4ada776..2f6f42a4f805c6849218274d8fb55b0850a69592
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -70,14 -70,14 +70,14 @@@ config SPI_ATH7
  
  config SPI_ATMEL
        tristate "Atmel SPI Controller"
 -      depends on (ARCH_AT91 || AVR32)
 +      depends on (ARCH_AT91 || AVR32 || COMPILE_TEST)
        help
          This selects a driver for the Atmel SPI Controller, present on
          many AT32 (AVR32) and AT91 (ARM) chips.
  
  config SPI_BCM2835
        tristate "BCM2835 SPI controller"
 -      depends on ARCH_BCM2835
 +      depends on ARCH_BCM2835 || COMPILE_TEST
        help
          This selects a driver for the Broadcom BCM2835 SPI master.
  
@@@ -88,17 -88,10 +88,17 @@@
  
  config SPI_BFIN5XX
        tristate "SPI controller driver for ADI Blackfin5xx"
 -      depends on BLACKFIN
 +      depends on BLACKFIN && !BF60x
        help
          This is the SPI controller master driver for Blackfin 5xx processor.
  
 +config SPI_BFIN_V3
 +      tristate "SPI controller v3 for Blackfin"
 +      depends on BF60x
 +      help
 +        This is the SPI controller v3 master driver
 +        found on Blackfin 60x processor.
 +
  config SPI_BFIN_SPORT
        tristate "SPI bus via Blackfin SPORT"
        depends on BLACKFIN
@@@ -158,7 -151,7 +158,7 @@@ config SPI_COLDFIRE_QSP
  
  config SPI_DAVINCI
        tristate "Texas Instruments DaVinci/DA8x/OMAP-L/AM1x SoC SPI controller"
-       depends on ARCH_DAVINCI
+       depends on ARCH_DAVINCI || ARCH_KEYSTONE
        select SPI_BITBANG
        select TI_EDMA
        help
@@@ -166,7 -159,7 +166,7 @@@
  
  config SPI_EP93XX
        tristate "Cirrus Logic EP93xx SPI controller"
 -      depends on ARCH_EP93XX
 +      depends on ARCH_EP93XX || COMPILE_TEST
        help
          This enables using the Cirrus EP93xx SPI controller in master
          mode.
@@@ -198,7 -191,7 +198,7 @@@ config SPI_GPI
  
  config SPI_IMX
        tristate "Freescale i.MX SPI controllers"
 -      depends on ARCH_MXC
 +      depends on ARCH_MXC || COMPILE_TEST
        select SPI_BITBANG
        default m if IMX_HAVE_PLATFORM_SPI_IMX
        help
@@@ -287,20 -280,20 +287,20 @@@ config SPI_OMAP_UWIR
  
  config SPI_OMAP24XX
        tristate "McSPI driver for OMAP"
 -      depends on ARCH_OMAP2PLUS
 +      depends on ARCH_OMAP2PLUS || COMPILE_TEST
        help
          SPI master controller for OMAP24XX and later Multichannel SPI
          (McSPI) modules.
  
  config SPI_OMAP_100K
        tristate "OMAP SPI 100K"
 -      depends on ARCH_OMAP850 || ARCH_OMAP730
 +      depends on ARCH_OMAP850 || ARCH_OMAP730 || COMPILE_TEST
        help
          OMAP SPI 100K master controller for omap7xx boards.
  
  config SPI_ORION
        tristate "Orion SPI master"
 -      depends on PLAT_ORION
 +      depends on PLAT_ORION || COMPILE_TEST
        help
          This enables using the SPI master controller on the Orion chips.
  
@@@ -348,7 -341,7 +348,7 @@@ config SPI_PXA2XX_PC
  
  config SPI_RSPI
        tristate "Renesas RSPI controller"
 -      depends on SUPERH
 +      depends on SUPERH && SH_DMAE_BASE
        help
          SPI driver for Renesas RSPI blocks.
  
@@@ -392,7 -385,7 +392,7 @@@ config SPI_SH_MSIO
  
  config SPI_SH
        tristate "SuperH SPI controller"
 -      depends on SUPERH
 +      depends on SUPERH || COMPILE_TEST
        help
          SPI driver for SuperH SPI blocks.
  
@@@ -405,7 -398,7 +405,7 @@@ config SPI_SH_SC
  
  config SPI_SH_HSPI
        tristate "SuperH HSPI controller"
 -      depends on ARCH_SHMOBILE
 +      depends on ARCH_SHMOBILE || COMPILE_TEST
        help
          SPI driver for SuperH HSPI blocks.
  
@@@ -425,7 -418,7 +425,7 @@@ config SPI_MX
  
  config SPI_TEGRA114
        tristate "NVIDIA Tegra114 SPI Controller"
 -      depends on ARCH_TEGRA && TEGRA20_APB_DMA
 +      depends on (ARCH_TEGRA && TEGRA20_APB_DMA) || COMPILE_TEST
        help
          SPI driver for NVIDIA Tegra114 SPI Controller interface. This controller
          is different than the older SoCs SPI controller and also register interface
@@@ -433,7 -426,7 +433,7 @@@
  
  config SPI_TEGRA20_SFLASH
        tristate "Nvidia Tegra20 Serial flash Controller"
 -      depends on ARCH_TEGRA
 +      depends on ARCH_TEGRA || COMPILE_TEST
        help
          SPI driver for Nvidia Tegra20 Serial flash Controller interface.
          The main usecase of this controller is to use spi flash as boot
@@@ -441,7 -434,7 +441,7 @@@
  
  config SPI_TEGRA20_SLINK
        tristate "Nvidia Tegra20/Tegra30 SLINK Controller"
 -      depends on ARCH_TEGRA && TEGRA20_APB_DMA
 +      depends on (ARCH_TEGRA && TEGRA20_APB_DMA) || COMPILE_TEST
        help
          SPI driver for Nvidia Tegra20/Tegra30 SLINK Controller interface.
  
@@@ -464,7 -457,7 +464,7 @@@ config SPI_TOPCLIFF_PC
  
  config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"
 -      depends on GPIOLIB && CPU_TX49XX
 +      depends on GPIOLIB && (CPU_TX49XX || COMPILE_TEST)
        help
          SPI driver for Toshiba TXx9 MIPS SoCs