SPI: Add support for TSC2101

The new driver is functionally the same as the old
drivers/ssi/omap-tsc2101 driver in the linux-omap tree.

Signed-off-by: Imre Deak <imre.deak@solidboot.com>

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 6ffa633..9933730 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -164,6 +164,14 @@ 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.
+
 #
 # Add new SPI protocol masters in alphabetical order above this line
 #

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index b812733..cf05cbc 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_SPI_S3C24XX)             += spi_s3c24xx.o
 
 # SPI protocol drivers (device/link on bus)
 obj-$(CONFIG_SPI_AT25)         += at25.o
+obj-$(CONFIG_SPI_TSC2101)      += tsc2101.o
 #      ... add above this line ...
 
 # SPI slave controller drivers (upstream link)

diff --cc drivers/spi/tsc2101.c
Simple merge

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