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 2a13e637e46ba4748b92c66a69ee4d70c574ea02..2e188e1127ebdbc94853f41ce86e488ced1acb1f 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -348,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"
@@ -379,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
@@ -392,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