1 files changed, 38 insertions, 2 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 28fce65b8594..2d9d70359360 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -169,6 +169,12 @@ config SPI_OMAP24XX
           SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI
           (McSPI) modules.
 
+config SPI_OMAP_100K
+        tristate "OMAP SPI 100K"
+        depends on SPI_MASTER && (ARCH_OMAP850 || ARCH_OMAP730)
+        help
+          OMAP SPI 100K master controller for omap7xx boards.
+
 config SPI_ORION
         tristate "Orion SPI master (EXPERIMENTAL)"
         depends on PLAT_ORION && EXPERIMENTAL
@@ -220,6 +226,13 @@ config SPI_S3C24XX_GPIO
           the inbuilt hardware cannot provide the transfer mode, or
           where the board is using non hardware connected pins.
 
+config SPI_SH_MSIOF
+        tristate "SuperH MSIOF SPI controller"
+        depends on SUPERH && HAVE_CLK
+        select SPI_BITBANG
+        help
+          SPI driver for SuperH MSIOF blocks.
+
 config SPI_SH_SCI
         tristate "SuperH SCI SPI controller"
         depends on SUPERH
@@ -240,15 +253,38 @@ config SPI_TXX9
           SPI driver for Toshiba TXx9 MIPS SoCs
 
 config SPI_XILINX
-        tristate "Xilinx SPI controller"
-        depends on (XILINX_VIRTEX || MICROBLAZE) && EXPERIMENTAL
+        tristate "Xilinx SPI controller common module"
+        depends on HAS_IOMEM && EXPERIMENTAL
         select SPI_BITBANG
+        select SPI_XILINX_OF if (XILINX_VIRTEX || MICROBLAZE)
         help
           This exposes the SPI controller IP from the Xilinx EDK.
 
           See the "OPB Serial Peripheral Interface (SPI) (v1.00e)"
           Product Specification document (DS464) for hardware details.
 
+          Or for the DS570, see "XPS Serial Peripheral Interface (SPI) (v2.00b)"
+
+config SPI_XILINX_OF
+        tristate "Xilinx SPI controller OF device"
+        depends on SPI_XILINX && (XILINX_VIRTEX || MICROBLAZE)
+        help
+          This is the OF driver for the SPI controller IP from the Xilinx EDK.
+
+config SPI_XILINX_PLTFM
+        tristate "Xilinx SPI controller platform device"
+        depends on SPI_XILINX
+        help
+          This is the platform driver for the SPI controller IP
+          from the Xilinx EDK.
+
+config SPI_NUC900
+        tristate "Nuvoton NUC900 series SPI"
+        depends on ARCH_W90X900 && EXPERIMENTAL
+        select SPI_BITBANG
+        help
+          SPI driver for Nuvoton NUC900 series ARM SoCs
+
 #
 # Add new SPI master controllers in alphabetical order above this line
 #