Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 43d41f50b84ac30d951f63cd3dc9c387019f0297..7e54e48efd5cb6af7c9451811871f303bef7c854 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -51,6 +51,13 @@ config SPI_MASTER
 comment "SPI Master Controller Drivers"
        depends on SPI_MASTER
 
+config SPI_ATMEL
+       tristate "Atmel SPI Controller"
+       depends on (ARCH_AT91 || AVR32) && SPI_MASTER
+       help
+         This selects a driver for the Atmel SPI Controller, present on
+         many AT32 (AVR32) and AT91 (ARM) chips.
+
 config SPI_BITBANG
        tristate "Bitbanging SPI master"
        depends on SPI_MASTER && EXPERIMENTAL
@@ -75,6 +82,13 @@ config SPI_BUTTERFLY
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
 
+config SPI_IMX
+       tristate "Freescale iMX SPI controller"
+       depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
+       help
+         This enables using the Freescale iMX SPI controller in master
+         mode.
+
 config SPI_MPC83xx
        tristate "Freescale MPC83xx SPI controller"
        depends on SPI_MASTER && PPC_83xx && EXPERIMENTAL
@@ -87,6 +101,14 @@ config SPI_MPC83xx
          family of PowerPC processors.  The MPC83xx uses a simple set of shift
          registers for data (opposed to the CPM based descriptor model).
 
+config SPI_OMAP_UWIRE
+       tristate "OMAP1 MicroWire"
+       depends on SPI_MASTER && ARCH_OMAP1
+       select SPI_BITBANG
+       help
+         This hooks up to the MicroWire controller on OMAP1 chips.
+
+
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
        depends on SPI_MASTER && ARCH_PXA && EXPERIMENTAL
@@ -120,6 +142,16 @@ config SPI_S3C24XX_GPIO
 comment "SPI Protocol Masters"
        depends on SPI_MASTER
 
+config SPI_AT25
+       tristate "SPI EEPROMs from most vendors"
+       depends on SPI_MASTER && 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.
 
 #
 # Add new SPI protocol masters in alphabetical order above this line