diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2009-09-16 04:06:42 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-18 02:24:00 -0400 |
commit | 36fb25277825b6ef6acd57091e6aaa6dc8a4c203 (patch) | |
tree | c59a1a3f8f324f813f15a30ccdcaf70d7837a25c | |
parent | 9605fb48e1998935a5ee70c965f90ad1ac023add (diff) |
Input: ad7879 - add support for AD7889
The AD7889 is a new part but 100% software compatible with the AD7879, so
add it to the id_table and help text.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | drivers/input/touchscreen/Kconfig | 6 | ||||
-rw-r--r-- | drivers/input/touchscreen/ad7879.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 87a1ae63bcc4..5a252d449e55 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
@@ -48,8 +48,8 @@ config TOUCHSCREEN_AD7879_I2C | |||
48 | select TOUCHSCREEN_AD7879 | 48 | select TOUCHSCREEN_AD7879 |
49 | help | 49 | help |
50 | Say Y here if you have a touchscreen interface using the | 50 | Say Y here if you have a touchscreen interface using the |
51 | AD7879-1 controller, and your board-specific initialization | 51 | AD7879-1/AD7889-1 controller, and your board-specific |
52 | code includes that in its table of I2C devices. | 52 | initialization code includes that in its table of I2C devices. |
53 | 53 | ||
54 | If unsure, say N (but it's safe to say "Y"). | 54 | If unsure, say N (but it's safe to say "Y"). |
55 | 55 | ||
@@ -62,7 +62,7 @@ config TOUCHSCREEN_AD7879_SPI | |||
62 | select TOUCHSCREEN_AD7879 | 62 | select TOUCHSCREEN_AD7879 |
63 | help | 63 | help |
64 | Say Y here if you have a touchscreen interface using the | 64 | Say Y here if you have a touchscreen interface using the |
65 | AD7879 controller, and your board-specific initialization | 65 | AD7879/AD7889 controller, and your board-specific initialization |
66 | code includes that in its table of SPI devices. | 66 | code includes that in its table of SPI devices. |
67 | 67 | ||
68 | If unsure, say N (but it's safe to say "Y"). | 68 | If unsure, say N (but it's safe to say "Y"). |
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c index 5d8a70398807..806464177e02 100644 --- a/drivers/input/touchscreen/ad7879.c +++ b/drivers/input/touchscreen/ad7879.c | |||
@@ -1,7 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2008 Michael Hennerich, Analog Devices Inc. | 2 | * Copyright (C) 2008-2009 Michael Hennerich, Analog Devices Inc. |
3 | * | 3 | * |
4 | * Description: AD7879 based touchscreen, and GPIO driver (I2C/SPI Interface) | 4 | * Description: AD7879/AD7889 based touchscreen, and GPIO driver |
5 | * (I2C/SPI Interface) | ||
5 | * | 6 | * |
6 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | 7 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ |
7 | * | 8 | * |
@@ -747,6 +748,7 @@ static int __devexit ad7879_remove(struct i2c_client *client) | |||
747 | 748 | ||
748 | static const struct i2c_device_id ad7879_id[] = { | 749 | static const struct i2c_device_id ad7879_id[] = { |
749 | { "ad7879", 0 }, | 750 | { "ad7879", 0 }, |
751 | { "ad7889", 0 }, | ||
750 | { } | 752 | { } |
751 | }; | 753 | }; |
752 | MODULE_DEVICE_TABLE(i2c, ad7879_id); | 754 | MODULE_DEVICE_TABLE(i2c, ad7879_id); |