Merge branch 'spi-next' from git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git

Pull in the changes Mark has queued up for SPI

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 2a13e637e46b..506584237355 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -392,6 +392,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