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

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

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index b0f30fb..4887f31 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -326,6 +326,15 @@ config SPI_MESON_SPIFC
          This enables master mode support for the SPIFC (SPI flash
          controller) available in Amlogic Meson SoCs.
 
+config SPI_MT65XX
+       tristate "MediaTek SPI controller"
+       depends on ARCH_MEDIATEK || COMPILE_TEST
+       help
+         This selects the MediaTek(R) SPI bus driver.
+         If you want to use MediaTek(R) SPI interface,
+         say Y or M here.If you are not sure, say N.
+         SPI drivers for Mediatek MT65XX and MT81XX series ARM SoCs.
+
 config SPI_OC_TINY
        tristate "OpenCores tiny SPI"
        depends on GPIOLIB || COMPILE_TEST
@@ -598,6 +607,17 @@ config SPI_XILINX
 
          Or for the DS570, see "XPS Serial Peripheral Interface (SPI) (v2.00b)"
 
+config SPI_XLP
+       tristate "Netlogic XLP SPI controller driver"
+       depends on CPU_XLP || COMPILE_TEST
+       help
+         Enable support for the SPI controller on the Netlogic XLP SoCs.
+         Currently supported XLP variants are XLP8XX, XLP3XX, XLP2XX, XLP9XX
+         and XLP5XX.
+
+         If you have a Netlogic XLP platform say Y here.
+         If unsure, say N.
+
 config SPI_XTENSA_XTFPGA
        tristate "Xtensa SPI controller for xtfpga"
        depends on (XTENSA && XTENSA_PLATFORM_XTFPGA) || COMPILE_TEST