SPI: Add support for TSC2301 protocol driver

This adds a driver for TSC2301 including support for audio, keypad and
touchscreen. Patch is originally developed for Nokia N800 by Imre Deak,
Jarkko Nikula, Jarkko Oikarinen and Juha Yrjola.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 9daa4bb..6fd6a47 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -198,6 +198,28 @@ config SPI_TSC2102
          Say Y here if you want support for the TSC2102 chip.  It
         will be needed for the touchscreen driver on some boards.
         
+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

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index d44d651..bbb3ca9 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -31,6 +31,9 @@ obj-$(CONFIG_SPI_AT25)                += at25.o
 obj-$(CONFIG_SPI_SPIDEV)       += spidev.o
 obj-$(CONFIG_SPI_TSC2101)      += tsc2101.o
 obj-$(CONFIG_SPI_TSC2102)      += tsc2102.o
+obj-$(CONFIG_SPI_TSC2301)      += tsc2301.o
+tsc2301-objs                   := tsc2301-core.o
+tsc2301-$(CONFIG_SPI_TSC2301_AUDIO)    += tsc2301-mixer.o
 #      ... add above this line ...
 
 # SPI slave controller drivers (upstream link)

diff --cc drivers/spi/tsc2301-core.c
Simple merge

diff --cc drivers/spi/tsc2301-mixer.c
Simple merge

diff --cc include/linux/spi/tsc2301.h
Simple merge