Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull SPI changes for v3.4 from Grant Likely:
 "Mostly a bunch of new drivers and driver bug fixes; but this also
  includes a few patches that create a core message queue infrastructure
  for the spi subsystem instead of making each driver open code it."

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
  spi/fsl-espi: Make sure pm is within 2..32
  spi/fsl-espi: make the clock computation easier to read
  spi: sh-hspi: modify write/read method
  spi: sh-hspi: control spi clock more correctly
  spi: sh-hspi: convert to using core message queue
  spi: s3c64xx: Fix build
  spi: s3c64xx: remove unnecessary callback msg->complete
  spi: remove redundant variable assignment
  spi: release lock on error path in spi_pump_messages()
  spi: Compatibility with direction which is used in samsung DMA operation
  spi-topcliff-pch: add recovery processing in case wait-event timeout
  spi-topcliff-pch: supports a spi mode setup and bit order setup by IO control
  spi-topcliff-pch: Fix issue for transmitting over 4KByte
  spi-topcliff-pch: Modify pci-bus number dynamically to get DMA device info
  spi/imx: simplify error handling to free gpios
  spi: Convert to DEFINE_PCI_DEVICE_TABLE
  spi: add Broadcom BCM63xx SPI controller driver
  SPI: add CSR SiRFprimaII SPI controller driver
  spi-topcliff-pch: fix -Wuninitialized warning
  spi: Mark spi_register_board_info() __devinit
  ...

1 files changed, 30 insertions, 6 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 8293658e7cf9..0b06e360628a 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -94,6 +94,12 @@ config SPI_AU1550
           If you say yes to this option, support will be included for the
           PSC SPI controller found on Au1550, Au1200 and Au1300 series.
 
+config SPI_BCM63XX
+        tristate "Broadcom BCM63xx SPI controller"
+        depends on BCM63XX
+        help
+          Enable support for the SPI controller on the Broadcom BCM63xx SoCs.
+
 config SPI_BITBANG
         tristate "Utilities for Bitbanging SPI masters"
         help
@@ -126,7 +132,7 @@ config SPI_COLDFIRE_QSPI
 
 config SPI_DAVINCI
         tristate "Texas Instruments DaVinci/DA8x/OMAP-L/AM1x SoC SPI controller"
-        depends on SPI_MASTER && ARCH_DAVINCI
+        depends on ARCH_DAVINCI
         select SPI_BITBANG
         help
           SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.
@@ -188,7 +194,7 @@ config SPI_MPC52xx_PSC
 
 config SPI_MPC512x_PSC
         tristate "Freescale MPC512x PSC SPI controller"
-        depends on SPI_MASTER && PPC_MPC512x
+        depends on PPC_MPC512x
         help
           This enables using the Freescale MPC5121 Programmable Serial
           Controller in SPI master mode.
@@ -238,7 +244,7 @@ config SPI_OMAP24XX
 
 config SPI_OMAP_100K
         tristate "OMAP SPI 100K"
-        depends on SPI_MASTER && (ARCH_OMAP850 || ARCH_OMAP730)
+        depends on ARCH_OMAP850 || ARCH_OMAP730
         help
           OMAP SPI 100K master controller for omap7xx boards.
 
@@ -262,7 +268,7 @@ config SPI_PL022
 
 config SPI_PPC4xx
         tristate "PPC4xx SPI Controller"
-        depends on PPC32 && 4xx && SPI_MASTER
+        depends on PPC32 && 4xx
         select SPI_BITBANG
         help
           This selects a driver for the PPC4xx SPI Controller.
@@ -279,6 +285,12 @@ config SPI_PXA2XX
 config SPI_PXA2XX_PCI
         def_bool SPI_PXA2XX && X86_32 && PCI
 
+config SPI_RSPI
+        tristate "Renesas RSPI controller"
+        depends on SUPERH
+        help
+          SPI driver for Renesas RSPI blocks.
+
 config SPI_S3C24XX
         tristate "Samsung S3C24XX series SPI"
         depends on ARCH_S3C2410 && EXPERIMENTAL
@@ -324,9 +336,22 @@ config SPI_SH_SCI
         help
           SPI driver for SuperH SCI blocks.
 
+config SPI_SH_HSPI
+        tristate "SuperH HSPI controller"
+        depends on ARCH_SHMOBILE
+        help
+          SPI driver for SuperH HSPI blocks.
+
+config SPI_SIRF
+        tristate "CSR SiRFprimaII SPI controller"
+        depends on ARCH_PRIMA2
+        select SPI_BITBANG
+        help
+          SPI driver for CSR SiRFprimaII SoCs
+
 config SPI_STMP3XXX
         tristate "Freescale STMP37xx/378x SPI/SSP controller"
-        depends on ARCH_STMP3XXX && SPI_MASTER
+        depends on ARCH_STMP3XXX
         help
           SPI driver for Freescale STMP37xx/378x SoC SSP interface
 
@@ -384,7 +409,6 @@ config SPI_NUC900
 
 config SPI_DESIGNWARE
         tristate "DesignWare SPI controller core support"
-        depends on SPI_MASTER
         help
           general driver for SPI controller core from DesignWare