1 files changed, 28 insertions, 2 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 2be0de920d67..141d8c10b764 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -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
@@ -219,16 +230,23 @@ config SPI_MPC512x_PSC
 
 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"
@@ -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