Commit:     bff0de5f59ff935138eb41c397a7e50468028b83
Parent:     36bd52a49b790a71f3d353cdddf2f22e1e6f84ff
Author:     David Brownell <[EMAIL PROTECTED]>
AuthorDate: Tue May 22 23:28:40 2007 -0400
Committer:  Dmitry Torokhov <[EMAIL PROTECTED]>
CommitDate: Tue May 22 23:28:40 2007 -0400

    Input: ads7846 - document that it handles tsc2046 too
    The TSC2046 is an updated version of the ADS7846 ... mention that in
    the Kconfig helptext and driver source.
    Signed-off-by: David Brownell <[EMAIL PROTECTED]>
    Acked-by: Kevin Hilman <[EMAIL PROTECTED]>
    Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]>
 drivers/input/touchscreen/Kconfig   |    8 ++++----
 drivers/input/touchscreen/ads7846.c |    1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/Kconfig 
index 5e640ae..c0b36cc 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -12,17 +12,17 @@ menuconfig INPUT_TOUCHSCREEN
-       tristate "ADS 7846/7843 based touchscreens"
+       tristate "ADS7846/TSC2046 and ADS7843 based touchscreens"
        depends on SPI_MASTER
        depends on HWMON = n || HWMON
          Say Y here if you have a touchscreen interface using the
-         ADS7846 or ADS7843 controller, and your board-specific setup
-         code includes that in its table of SPI devices.
+         ADS7846/TSC2046 or ADS7843 controller, and your board-specific
+         setup code includes that in its table of SPI devices.
          If HWMON is selected, and the driver is told the reference voltage
          on your board, you will also get hwmon interfaces for the voltage
-         (and on ads7846, temperature) sensors of this chip.
+         (and on ads7846/tsc2046, temperature) sensors of this chip.
          If unsure, say N (but it's safe to say "Y").
diff --git a/drivers/input/touchscreen/ads7846.c 
index 693e3b2..b0110fe 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -39,6 +39,7 @@
  * This code has been heavily tested on a Nokia 770, and lightly
  * tested on other ads7846 devices (OSK/Mistral, Lubbock).
+ * TSC2046 is just newer ads7846 silicon.
  * Support for ads7843 tested on Atmel at91sam926x-EK.
  * Support for ads7845 has only been stubbed in.
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to