TSC2101: convert existing driver to use the SPI framework

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

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

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index c1874c6..47a9c6f 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -154,6 +154,14 @@ config SPI_OMAP24XX
 comment "SPI Protocol Masters"
        depends on SPI_MASTER
 
+config 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 TSC2102
        depends on SPI_MASTER
        tristate "TSC2102 codec support"

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 41bb1f2..aa5e022 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_SPI_OMAP_UWIRE)          += omap_uwire.o
 #      ... add above this line ...
 
 # SPI protocol drivers (device/link on bus)
+obj-$(CONFIG_TSC2101)                  += tsc2101.o
 obj-$(CONFIG_TSC2102)                  += tsc2102.o
 obj-$(CONFIG_SPI_AT25)         += at25.o
 obj-$(CONFIG_SPI_TSC2301)              += tsc2301.o

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

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