Merge omap-drivers

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

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 948a9dc79adbdbe0667a7919255134edb40c2982..8c646579f6881f849cb45dedfcbf8082459f4118 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
@@ -95,6 +117,12 @@ config SPI_PXA2XX
          The driver can be configured to use any SSP port and additional
          documentation can be found a Documentation/spi/pxa2xx.
 
+config SPI_S3C24XX
+       tristate "Samsung S3C24XX series SPI"
+       depends on SPI_MASTER && ARCH_S3C2410 && EXPERIMENTAL
+       help
+         SPI driver for Samsung S3C24XX series ARM SoCs
+
 config SPI_S3C24XX_GPIO
        tristate "Samsung S3C24XX series SPI by GPIO"
        depends on SPI_MASTER && ARCH_S3C2410 && SPI_BITBANG && EXPERIMENTAL
@@ -121,13 +149,6 @@ config SPI_OMAP24XX
 # Add new SPI master controllers in alphabetical order above this line
 #
 
-
-config SPI_S3C24XX
-       tristate "Samsung S3C24XX series SPI"
-       depends on SPI_MASTER && ARCH_S3C2410 && EXPERIMENTAL
-       help
-         SPI driver for Samsung S3C24XX series ARM SoCs
-
 #
 # There are lots of SPI device types, with sensors and memory
 # being probably the most widely used ones.
@@ -141,6 +162,18 @@ config TSC2102
        ---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_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
 #