Merge remote-tracking branches 'spi/topic/bcm53xx', 'spi/topic/bcm63xx', 'spi/topic...

[mirror_ubuntu-zesty-kernel.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 4887f317ea58f7c5566fcb1481559831b7f81180..cac92245e3ef8d5528dc7ab7cbedbe7fecc524b4 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -88,6 +88,17 @@ config SPI_BCM2835
          is for the regular SPI controller. Slave mode operation is not also
          not supported.
 
+config SPI_BCM2835AUX
+       tristate "BCM2835 SPI auxiliary controller"
+       depends on ARCH_BCM2835 || COMPILE_TEST
+       depends on GPIOLIB
+       help
+         This selects a driver for the Broadcom BCM2835 SPI aux master.
+
+         The BCM2835 contains two types of SPI master controller; the
+         "universal SPI master", and the regular SPI controller.
+         This driver is for the universal/auxiliary SPI controller.
+
 config SPI_BFIN5XX
        tristate "SPI controller driver for ADI Blackfin5xx"
        depends on BLACKFIN && !BF60x
@@ -125,7 +136,7 @@ config SPI_BCM53XX
 
 config SPI_BCM63XX
        tristate "Broadcom BCM63xx SPI controller"
-       depends on BCM63XX
+       depends on BCM63XX || COMPILE_TEST
        help
           Enable support for the SPI controller on the Broadcom BCM63xx SoCs.