Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/st-ssc4' and 'spi/topic...

[sfrench/cifs-2.6.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 1761c9004fc1149e8552b86525613e93c2b49cf4..9b31351fe429e9776e7f6a44f7485fc9f49c0374 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -393,6 +393,13 @@ config SPI_FSL_ESPI
          From MPC8536, 85xx platform uses the controller, and all P10xx,
          P20xx, P30xx,P40xx, P50xx uses this controller.
 
+config SPI_MESON_SPICC
+       tristate "Amlogic Meson SPICC controller"
+       depends on ARCH_MESON || COMPILE_TEST
+       help
+         This enables master mode support for the SPICC (SPI communication
+         controller) available in Amlogic Meson SoCs.
+
 config SPI_MESON_SPIFC
        tristate "Amlogic Meson SPIFC controller"
        depends on ARCH_MESON || COMPILE_TEST
@@ -457,6 +464,7 @@ config SPI_OMAP24XX
 
 config SPI_TI_QSPI
        tristate "DRA7xxx QSPI controller support"
+       depends on HAS_DMA
        depends on ARCH_OMAP2PLUS || COMPILE_TEST
        help
          QSPI master controller for DRA7xxx used for flash devices.
@@ -619,6 +627,16 @@ config SPI_SIRF
        help
          SPI driver for CSR SiRFprimaII SoCs
 
+config SPI_STM32
+       tristate "STMicroelectronics STM32 SPI controller"
+       depends on ARCH_STM32 || COMPILE_TEST
+       help
+         SPI driver for STMicroelectonics STM32 SoCs.
+
+         STM32 SPI controller supports DMA and PIO modes. When DMA
+         is not available, the driver automatically falls back to
+         PIO mode.
+
 config SPI_ST_SSC4
        tristate "STMicroelectronics SPI SSC-based driver"
        depends on ARCH_STI || COMPILE_TEST
@@ -784,6 +802,30 @@ config SPI_TLE62X0
 
 endif # SPI_MASTER
 
-# (slave support would go here)
+#
+# SLAVE side ... listening to other SPI masters
+#
+
+config SPI_SLAVE
+       bool "SPI slave protocol handlers"
+       help
+         If your system has a slave-capable SPI controller, you can enable
+         slave protocol handlers.
+
+if SPI_SLAVE
+
+config SPI_SLAVE_TIME
+       tristate "SPI slave handler reporting boot up time"
+       help
+         SPI slave handler responding with the time of reception of the last
+         SPI message.
+
+config SPI_SLAVE_SYSTEM_CONTROL
+       tristate "SPI slave handler controlling system state"
+       help
+         SPI slave handler to allow remote control of system reboot, power
+         off, halt, and suspend.
+
+endif # SPI_SLAVE
 
 endif # SPI