Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 927a8b77e60494845bff5b0b45ab96f91d25a518..4b6f7cba3b3dc536d6e8480d5c2b1e14523bb329 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -116,6 +116,14 @@ config SPI_GPIO
          GPIO operations, you should be able to leverage that for better
          speed with a custom version of this driver; see the source code.
 
+config SPI_IMX
+       tristate "Freescale i.MX SPI controllers"
+       depends on ARCH_MXC
+       select SPI_BITBANG
+       help
+         This enables using the Freescale i.MX SPI controllers in master
+         mode.
+
 config SPI_LM70_LLP
        tristate "Parallel port adapter for LM70 eval board (DEVELOPMENT)"
        depends on PARPORT && EXPERIMENTAL
@@ -214,6 +222,12 @@ config SPI_SH_SCI
        help
          SPI driver for SuperH SCI blocks.
 
+config SPI_STMP3XXX
+       tristate "Freescale STMP37xx/378x SPI/SSP controller"
+       depends on ARCH_STMP3XXX && SPI_MASTER
+       help
+         SPI driver for Freescale STMP37xx/378x SoC SSP interface
+
 config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"
        depends on GENERIC_GPIO && CPU_TX49XX