Merge remote-tracking branches 'spi/topic/adi', 'spi/topic/atmel' and 'spi/topic...

[karo-tx-linux.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 722312fe19be3635e6d2c27df8ad2cecab8349ed..213b5cbb9dccede248f7a02b08f1fb36c2980672 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -91,8 +91,8 @@ config SPI_BFIN5XX
        help
          This is the SPI controller master driver for Blackfin 5xx processor.
 
-config SPI_BFIN_V3
-       tristate "SPI controller v3 for Blackfin"
+config SPI_ADI_V3
+       tristate "SPI controller v3 for ADI"
        depends on BF60x
        help
          This is the SPI controller v3 master driver
@@ -148,6 +148,13 @@ config SPI_BUTTERFLY
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
 
+config SPI_CADENCE
+       tristate "Cadence SPI controller"
+       depends on ARM
+       help
+         This selects the Cadence SPI controller master driver
+         used by Xilinx Zynq.
+
 config SPI_CLPS711X
        tristate "CLPS711X host SPI controller"
        depends on ARCH_CLPS711X || COMPILE_TEST