Merge tag 'v3.10' into master-next

[vajnamar/linux-xlnx.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index d0112d7c7e493693f1020e11aa420d8520f34988..6f9c382ba667a63a8569538f9ad083b8cb7f5087 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -62,7 +62,7 @@ config SPI_ALTERA
 
 config SPI_ATH79
        tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"
-       depends on ATH79 && GENERIC_GPIO
+       depends on ATH79 && GPIOLIB
        select SPI_BITBANG
        help
          This enables support for the SPI controller present on the
@@ -75,6 +75,17 @@ config SPI_ATMEL
          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
+       help
+         This selects a driver for the Broadcom BCM2835 SPI master.
+
+         The BCM2835 contains two types of SPI master controller; the
+         "universal SPI master", and the regular SPI controller. This driver
+         is for the regular SPI controller. Slave mode operation is not also
+         not supported.
+
 config SPI_BFIN5XX
        tristate "SPI controller driver for ADI Blackfin5xx"
        depends on BLACKFIN
@@ -164,7 +175,7 @@ config SPI_FALCON
 
 config SPI_GPIO
        tristate "GPIO-based bitbanging SPI Master"
-       depends on GENERIC_GPIO
+       depends on GPIOLIB
        select SPI_BITBANG
        help
          This simple GPIO bitbanging SPI master uses the arch-neutral GPIO
@@ -218,17 +229,24 @@ config SPI_MPC512x_PSC
          Controller in SPI master mode.
 
 config SPI_FSL_LIB
+       tristate
+       depends on OF
+
+config SPI_FSL_CPM
        tristate
        depends on FSL_SOC
 
 config SPI_FSL_SPI
-       bool "Freescale SPI controller"
-       depends on FSL_SOC
+       bool "Freescale SPI controller and Aeroflex Gaisler GRLIB SPI controller"
+       depends on OF
        select SPI_FSL_LIB
+       select SPI_FSL_CPM if FSL_SOC
        help
          This enables using the Freescale SPI controllers in master mode.
          MPC83xx platform uses the controller in cpu mode or CPM/QE mode.
          MPC8569 uses the controller in QE mode, MPC8610 in cpu mode.
+         This also enables using the Aeroflex Gaisler GRLIB SPI controller in
+         master mode.
 
 config SPI_FSL_ESPI
        bool "Freescale eSPI controller"
@@ -241,7 +259,7 @@ config SPI_FSL_ESPI
 
 config SPI_OC_TINY
        tristate "OpenCores tiny SPI"
-       depends on GENERIC_GPIO
+       depends on GPIOLIB
        select SPI_BITBANG
        help
          This is the driver for OpenCores tiny SPI master controller.
@@ -398,6 +416,14 @@ config SPI_MXS
        help
          SPI driver for Freescale MXS devices.
 
+config SPI_TEGRA114
+       tristate "NVIDIA Tegra114 SPI Controller"
+       depends on ARCH_TEGRA && TEGRA20_APB_DMA
+       help
+         SPI driver for NVIDIA Tegra114 SPI Controller interface. This controller
+         is different than the older SoCs SPI controller and also register interface
+         get changed with this controller.
+
 config SPI_TEGRA20_SFLASH
        tristate "Nvidia Tegra20 Serial flash Controller"
        depends on ARCH_TEGRA
@@ -431,7 +457,7 @@ config SPI_TOPCLIFF_PCH
 
 config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"
-       depends on GENERIC_GPIO && CPU_TX49XX
+       depends on GPIOLIB && CPU_TX49XX
        help
          SPI driver for Toshiba TXx9 MIPS SoCs