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 b91571122daadfd3c0f7ae6115f5c7bfe62784e2..0e80d771002dff2ef05f07fc8fc25c949daff704 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -61,7 +61,7 @@ config SPI_ATMEL
 
 config SPI_BFIN
        tristate "SPI controller driver for ADI Blackfin5xx"
-       depends on SPI_MASTER && BFIN
+       depends on SPI_MASTER && BLACKFIN
        help
          This is the SPI controller master driver for Blackfin 5xx processor.
 
@@ -124,16 +124,17 @@ config SPI_MPC52xx_PSC
          Controller in master SPI mode.
 
 config SPI_MPC83xx
-       tristate "Freescale MPC83xx SPI controller"
-       depends on SPI_MASTER && PPC_83xx && EXPERIMENTAL
+       tristate "Freescale MPC83xx/QUICC Engine SPI controller"
+       depends on SPI_MASTER && (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL
        select SPI_BITBANG
        help
-         This enables using the Freescale MPC83xx SPI controller in master
-         mode.
+         This enables using the Freescale MPC83xx and QUICC Engine SPI
+         controllers in master mode.
 
          Note, this driver uniquely supports the SPI controller on the MPC83xx
-         family of PowerPC processors.  The MPC83xx uses a simple set of shift
-         registers for data (opposed to the CPM based descriptor model).
+         family of PowerPC processors, plus processors with QUICC Engine
+         technology. This driver uses a simple set of shift registers for data
+         (opposed to the CPM based descriptor model).
 
 config SPI_OMAP_UWIRE
        tristate "OMAP1 MicroWire"
@@ -212,6 +213,62 @@ 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"
+       help
+         Say Y here if you want support for the TSC210x chips.  Some
+         boards use these for touchscreen and audio support.
+
+         These are members of a family of highly integrated PDA analog
+         interface circuit.  They include a 12-bit ADC used for battery,
+         temperature, touchscreen, and other sensors.  They also have
+         an audio DAC and amplifier, and in some models an audio ADC.
+         The audio support is highly chip-specific, but most of the
+         sensor support works the same.
+
+         Note that the device has to be present in the board's SPI
+         devices table for this driver to load.  This driver doesn't
+         automatically enable touchscreen, sensors or audio
+         functionality - enable these in their respective menus.
+
+config SPI_TSC2301
+       tristate "TSC2301 driver"
+       depends on SPI_MASTER
+       help
+         Say Y here if you have a TSC2301 chip connected to an SPI
+         bus on your board.
+
+         The TSC2301 is a highly integrated PDA analog interface circuit.
+         It contains a complete 12-bit A/D resistive touch screen
+         converter (ADC) including drivers, touch pressure measurement
+         capability, keypad controller, and 8-bit D/A converter (DAC) output
+         for LCD contrast control.
+
+         To compile this driver as a module, choose M here: the
+         module will be called tsc2301.
+
+config SPI_TSC2301_AUDIO
+       boolean "TSC2301 audio support"
+       depends on SPI_TSC2301 && SND
+       help
+         Say Y here for if you are using the audio features of TSC2301.
+
 config SPI_SPIDEV
        tristate "User mode SPI device driver support"
        depends on SPI_MASTER && EXPERIMENTAL