From 70de167a40e49ec25901632852c0ad5cc1bf6485 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Wed, 16 Sep 2009 01:06:42 -0700 Subject: [PATCH] --- yaml --- r: 165589 b: refs/heads/master c: 36fb25277825b6ef6acd57091e6aaa6dc8a4c203 h: refs/heads/master i: 165587: a5516b88a6ecd1408a6879f184be4cb8dbc37f18 v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/Kconfig | 6 +++--- trunk/drivers/input/touchscreen/ad7879.c | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d24bea222ceb..e7e6b9f2b5b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9605fb48e1998935a5ee70c965f90ad1ac023add +refs/heads/master: 36fb25277825b6ef6acd57091e6aaa6dc8a4c203 diff --git a/trunk/drivers/input/touchscreen/Kconfig b/trunk/drivers/input/touchscreen/Kconfig index 87a1ae63bcc4..5a252d449e55 100644 --- a/trunk/drivers/input/touchscreen/Kconfig +++ b/trunk/drivers/input/touchscreen/Kconfig @@ -48,8 +48,8 @@ config TOUCHSCREEN_AD7879_I2C select TOUCHSCREEN_AD7879 help Say Y here if you have a touchscreen interface using the - AD7879-1 controller, and your board-specific initialization - code includes that in its table of I2C devices. + AD7879-1/AD7889-1 controller, and your board-specific + initialization code includes that in its table of I2C devices. If unsure, say N (but it's safe to say "Y"). @@ -62,7 +62,7 @@ config TOUCHSCREEN_AD7879_SPI select TOUCHSCREEN_AD7879 help Say Y here if you have a touchscreen interface using the - AD7879 controller, and your board-specific initialization + AD7879/AD7889 controller, and your board-specific initialization code includes that in its table of SPI devices. If unsure, say N (but it's safe to say "Y"). diff --git a/trunk/drivers/input/touchscreen/ad7879.c b/trunk/drivers/input/touchscreen/ad7879.c index 5d8a70398807..806464177e02 100644 --- a/trunk/drivers/input/touchscreen/ad7879.c +++ b/trunk/drivers/input/touchscreen/ad7879.c @@ -1,7 +1,8 @@ /* - * Copyright (C) 2008 Michael Hennerich, Analog Devices Inc. + * Copyright (C) 2008-2009 Michael Hennerich, Analog Devices Inc. * - * Description: AD7879 based touchscreen, and GPIO driver (I2C/SPI Interface) + * Description: AD7879/AD7889 based touchscreen, and GPIO driver + * (I2C/SPI Interface) * * Bugs: Enter bugs at http://blackfin.uclinux.org/ * @@ -747,6 +748,7 @@ static int __devexit ad7879_remove(struct i2c_client *client) static const struct i2c_device_id ad7879_id[] = { { "ad7879", 0 }, + { "ad7889", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, ad7879_id);