1 files changed, 17 insertions, 21 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 78f9fd02c1b2..1906840c1113 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -111,11 +111,14 @@ config SPI_COLDFIRE_QSPI
           will be called coldfire_qspi.
 
 config SPI_DAVINCI
-        tristate "SPI controller driver for DaVinci/DA8xx SoC's"
+        tristate "Texas Instruments DaVinci/DA8x/OMAP-L/AM1x SoC SPI controller"
         depends on SPI_MASTER && ARCH_DAVINCI
         select SPI_BITBANG
         help
-          SPI master controller for DaVinci and DA8xx SPI modules.
+          SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.
+
+          This driver can also be built as a module. The module will be called
+          davinci_spi.
 
 config SPI_EP93XX
         tristate "Cirrus Logic EP93xx SPI controller"
@@ -267,12 +270,15 @@ config SPI_PPC4xx
 
 config SPI_PXA2XX
         tristate "PXA2xx SSP SPI master"
-        depends on ARCH_PXA && EXPERIMENTAL
-        select PXA_SSP
+        depends on (ARCH_PXA || (X86_32 && PCI)) && EXPERIMENTAL
+        select PXA_SSP if ARCH_PXA
         help
-          This enables using a PXA2xx SSP port as a SPI master controller.
-          The driver can be configured to use any SSP port and additional
-          documentation can be found a Documentation/spi/pxa2xx.
+          This enables using a PXA2xx or Sodaville SSP port as a SPI master
+          controller. The driver can be configured to use any SSP port and
+          additional documentation can be found a Documentation/spi/pxa2xx.
+
+config SPI_PXA2XX_PCI
+        def_bool SPI_PXA2XX && X86_32 && PCI
 
 config SPI_S3C24XX
         tristate "Samsung S3C24XX series SPI"
@@ -353,7 +359,6 @@ config SPI_XILINX
         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.
 
@@ -362,19 +367,6 @@ config SPI_XILINX
 
           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
@@ -396,6 +388,10 @@ config SPI_DW_PCI
         tristate "PCI interface driver for DW SPI core"
         depends on SPI_DESIGNWARE && PCI
 
+config SPI_DW_MID_DMA
+        bool "DMA support for DW SPI controller on Intel Moorestown platform"
+        depends on SPI_DW_PCI && INTEL_MID_DMAC
+
 config SPI_DW_MMIO
         tristate "Memory-mapped io interface driver for DW SPI core"
         depends on SPI_DESIGNWARE && HAVE_CLK