Input: schedule corgi_ssp and corgi_ts to be removed

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

2 files changed, 12 insertions, 1 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index f8dc4d92e114..54d2d7795544 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -553,3 +553,15 @@ Why:	We now have a generic GPIO based matrix keyboard driver that
         The original drivers manipulate the GPIO registers directly
         and so are difficult to maintain.
 Who:    Eric Miao <eric.y.miao@gmail.com>
+
+----------------------------
+
+What:   corgi_ssp and corgi_ts driver
+When:   2.6.35
+Files:  arch/arm/mach-pxa/corgi_ssp.c, drivers/input/touchscreen/corgi_ts.c
+Why:    The corgi touchscreen is now deprecated in favour of the generic
+        ads7846.c driver. The noise reduction technique used in corgi_ts.c,
+        that's to wait till vsync before ADC sampling, is also integrated into
+        ads7846 driver now. Provided that the original driver is not generic
+        and is difficult to maintain, it will be removed later.
+Who:    Eric Miao <eric.y.miao@gmail.com>
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index a1e2d845f680..6457e060ae49 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -90,7 +90,6 @@ config TOUCHSCREEN_CORGI
         tristate "SharpSL (Corgi and Spitz series) touchscreen driver (DEPRECATED)"
         depends on PXA_SHARPSL
         select CORGI_SSP_DEPRECATED
-        default y
         help
           Say Y here to enable the driver for the touchscreen on the
           Sharp SL-C7xx and SL-Cxx00 series of PDAs.