Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pxa2xx', 'spi/topic...

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

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 68910915ca49a8896e76938dd85634b570558b13..ec4aa252d6e8c1c761a47246851ad2645382516e 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -67,6 +67,13 @@ config SPI_ATH79
          This enables support for the SPI controller present on the
          Atheros AR71XX/AR724X/AR913X SoCs.
 
+config SPI_ARMADA_3700
+       tristate "Marvell Armada 3700 SPI Controller"
+       depends on (ARCH_MVEBU && OF) || COMPILE_TEST
+       help
+         This enables support for the SPI controller present on the
+         Marvell Armada 3700 SoCs.
+
 config SPI_ATMEL
        tristate "Atmel SPI Controller"
        depends on HAS_DMA
@@ -264,6 +271,12 @@ config SPI_FALCON
          has only been tested with m25p80 type chips. The hardware has no
          support for other types of SPI peripherals.
 
+config SPI_FSL_LPSPI
+       tristate "Freescale i.MX LPSPI controller"
+       depends on ARCH_MXC || COMPILE_TEST
+       help
+         This enables Freescale i.MX LPSPI controllers in master mode.
+
 config SPI_GPIO
        tristate "GPIO-based bitbanging SPI Master"
        depends on GPIOLIB || COMPILE_TEST
@@ -373,7 +386,6 @@ config SPI_FSL_DSPI
 config SPI_FSL_ESPI
        tristate "Freescale eSPI controller"
        depends on FSL_SOC
-       select SPI_FSL_LIB
        help
          This enables using the Freescale eSPI controllers in master mode.
          From MPC8536, 85xx platform uses the controller, and all P10xx,
@@ -451,7 +463,8 @@ config SPI_ORION
        tristate "Orion SPI master"
        depends on PLAT_ORION || ARCH_MVEBU || COMPILE_TEST
        help
-         This enables using the SPI master controller on the Orion chips.
+         This enables using the SPI master controller on the Orion
+         and MVEBU chips.
 
 config SPI_PIC32
        tristate "Microchip PIC32 series SPI"