These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mtd / spi-nor / Kconfig

diff --git a/kernel/drivers/mtd/spi-nor/Kconfig b/kernel/drivers/mtd/spi-nor/Kconfig
index 64a4f0e..2fe2a7e 100644 (file)
--- a/kernel/drivers/mtd/spi-nor/Kconfig
+++ b/kernel/drivers/mtd/spi-nor/Kconfig
@@ -23,9 +23,22 @@ config MTD_SPI_NOR_USE_4K_SECTORS
 
 config SPI_FSL_QUADSPI
        tristate "Freescale Quad SPI controller"
-       depends on ARCH_MXC
+       depends on ARCH_MXC || COMPILE_TEST
+       depends on HAS_IOMEM
        help
          This enables support for the Quad SPI controller in master mode.
-         We only connect the NOR to this controller now.
+         This controller does not support generic SPI. It only supports
+         SPI NOR.
+
+config SPI_NXP_SPIFI
+       tristate "NXP SPI Flash Interface (SPIFI)"
+       depends on OF && (ARCH_LPC18XX || COMPILE_TEST)
+       depends on HAS_IOMEM
+       help
+         Enable support for the NXP LPC SPI Flash Interface controller.
+
+         SPIFI is a specialized controller for connecting serial SPI
+         Flash. Enable this option if you have a device with a SPIFI
+         controller and want to access the Flash as a mtd device.
 
 endif # MTD_SPI_NOR