Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index c04029a859837ecb87336c8f23bf65e03584351b..c203657178abd2478856067031eab348e97ea109 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -78,7 +78,7 @@ config SPI_AU1550
          will be called au1550_spi.
 
 config SPI_BITBANG
-       tristate "Bitbanging SPI master"
+       tristate "Utilities for Bitbanging SPI masters"
        help
          With a few GPIO pins, your system can bitbang the SPI protocol.
          Select this to get SPI support through I/O pins (GPIO, parallel
@@ -100,6 +100,22 @@ config SPI_BUTTERFLY
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
 
+config SPI_GPIO
+       tristate "GPIO-based bitbanging SPI Master"
+       depends on GENERIC_GPIO
+       select SPI_BITBANG
+       help
+         This simple GPIO bitbanging SPI master uses the arch-neutral GPIO
+         interface to manage MOSI, MISO, SCK, and chipselect signals.  SPI
+         slaves connected to a bus using this driver are configured as usual,
+         except that the spi_board_info.controller_data holds the GPIO number
+         for the chipselect used by this controller driver.
+
+         Note that this driver often won't achieve even 1 Mbit/sec speeds,
+         making it unusually slow for SPI.  If your platform can inline
+         GPIO operations, you should be able to leverage that for better
+         speed with a custom version of this driver; see the source code.
+
 config SPI_IMX
        tristate "Freescale iMX SPI controller"
        depends on ARCH_IMX && EXPERIMENTAL
@@ -225,21 +241,6 @@ config SPI_AT25
          This driver can also be built as a module.  If so, the module
          will be called at25.
 
-config SPI_TSC2101
-       depends on SPI_MASTER
-       tristate "TSC2101 chip support"
-       ---help---
-         Say Y here if you want support for the TSC2101 chip.
-        At the moment it provides basic register read / write interface
-        as well as a way to enable the MCLK clock.
-        
-config SPI_TSC2102
-       depends on SPI_MASTER
-       tristate "TSC2102 codec support"
-       ---help---
-         Say Y here if you want support for the TSC2102 chip.  It
-        will be needed for the touchscreen driver on some boards.
-
 config SPI_TSC210X
        depends on SPI_MASTER && EXPERIMENTAL
        tristate "TI TSC210x (TSC2101/TSC2102) support"