Merge branch 'topic/hwdep-cleanup' into topic/hdsp

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

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index b9d0efb6803f2919695c21ed6ba186303c51353c..83a185d52961e5075cd5330de7f770fc4eb28e79 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
@@ -214,17 +230,6 @@ config SPI_XILINX
 #
 comment "SPI Protocol Masters"
 
-config SPI_AT25
-       tristate "SPI EEPROMs from most vendors"
-       depends on SYSFS
-       help
-         Enable this driver to get read/write support to most SPI EEPROMs,
-         after you configure the board init code to know about each eeprom
-         on your target board.
-
-         This driver can also be built as a module.  If so, the module
-         will be called at25.
-
 config SPI_SPIDEV
        tristate "User mode SPI device driver support"
        depends on EXPERIMENTAL