Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[~andy/linux] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index ecc31a1f73fccb3852591df2fe6f79ff5e7de416..2e188e1127ebdbc94853f41ce86e488ced1acb1f 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -123,6 +123,13 @@ config SPI_BUTTERFLY
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
 
+config SPI_CLPS711X
+       tristate "CLPS711X host SPI controller"
+       depends on ARCH_CLPS711X
+       help
+         This enables dedicated general purpose SPI/Microwire1-compatible
+         master mode interface (SSI1) for CLPS711X-based CPUs.
+
 config SPI_COLDFIRE_QSPI
        tristate "Freescale Coldfire QSPI controller"
        depends on (M520x || M523x || M5249 || M525x || M527x || M528x || M532x)
@@ -134,6 +141,7 @@ config SPI_DAVINCI
        tristate "Texas Instruments DaVinci/DA8x/OMAP-L/AM1x SoC SPI controller"
        depends on ARCH_DAVINCI
        select SPI_BITBANG
+       select TI_EDMA
        help
          SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.
 
@@ -237,6 +245,13 @@ config SPI_OC_TINY
        help
          This is the driver for OpenCores tiny SPI master controller.
 
+config SPI_OCTEON
+       tristate "Cavium OCTEON SPI controller"
+       depends on CPU_CAVIUM_OCTEON
+       help
+         SPI host driver for the hardware found on some Cavium OCTEON
+         SOCs.
+
 config SPI_OMAP_UWIRE
        tristate "OMAP1 MicroWire"
        depends on ARCH_OMAP1
@@ -333,10 +348,10 @@ config SPI_SC18IS602
 
 config SPI_SH_MSIOF
        tristate "SuperH MSIOF SPI controller"
-       depends on SUPERH && HAVE_CLK
+       depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
        select SPI_BITBANG
        help
-         SPI driver for SuperH MSIOF blocks.
+         SPI driver for SuperH and SH Mobile MSIOF blocks.
 
 config SPI_SH
        tristate "SuperH SPI controller"
@@ -364,12 +379,6 @@ config SPI_SIRF
        help
          SPI driver for CSR SiRFprimaII SoCs
 
-config SPI_STMP3XXX
-       tristate "Freescale STMP37xx/378x SPI/SSP controller"
-       depends on ARCH_STMP3XXX
-       help
-         SPI driver for Freescale STMP37xx/378x SoC SSP interface
-
 config SPI_MXS
        tristate "Freescale MXS SPI controller"
        depends on ARCH_MXS
@@ -377,6 +386,20 @@ config SPI_MXS
        help
          SPI driver for Freescale MXS devices.
 
+config SPI_TEGRA20_SFLASH
+       tristate "Nvidia Tegra20 Serial flash Controller"
+       depends on ARCH_TEGRA
+       help
+         SPI driver for Nvidia Tegra20 Serial flash Controller interface.
+         The main usecase of this controller is to use spi flash as boot
+         device.
+
+config SPI_TEGRA20_SLINK
+       tristate "Nvidia Tegra20/Tegra30 SLINK Controller"
+       depends on ARCH_TEGRA && TEGRA20_APB_DMA
+       help
+         SPI driver for Nvidia Tegra20/Tegra30 SLINK Controller interface.
+
 config SPI_TI_SSP
        tristate "TI Sequencer Serial Port - SPI Support"
        depends on MFD_TI_SSP