Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/omap2-mcspi', 'spi...

[cascardo/linux.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 28147c8..b189508 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -431,10 +431,23 @@ config SPI_OMAP_100K
 
 config SPI_ORION
        tristate "Orion SPI master"
-       depends on PLAT_ORION || COMPILE_TEST
+       depends on PLAT_ORION || ARCH_MVEBU || COMPILE_TEST
        help
          This enables using the SPI master controller on the Orion chips.
 
+config SPI_PIC32
+       tristate "Microchip PIC32 series SPI"
+       depends on MACH_PIC32 || COMPILE_TEST
+       help
+         SPI driver for Microchip PIC32 SPI master controller.
+
+config SPI_PIC32_SQI
+       tristate "Microchip PIC32 Quad SPI driver"
+       depends on MACH_PIC32 || COMPILE_TEST
+       depends on HAS_DMA
+       help
+         SPI driver for PIC32 Quad SPI controller.
+
 config SPI_PL022
        tristate "ARM AMBA PL022 SSP controller"
        depends on ARM_AMBA