Input: mark {corgi,spitz,tosa}kbd drivers deprecated

Provided that now keyboards on these devices are fully supported by
generic GPIO based matrix keypad driver, mark these hardcoded and
difficult to maintain drivers as deprecated.

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 0a46833c1b764dfc4e983edfb55030e938e40948..f8dc4d92e1146a3837fada046e6745330ad0d283 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -542,3 +542,14 @@ Why:       Duplicate functionality with the gspca_zc3xx driver, zc0301 only
        sensors) wich are also supported by the gspca_zc3xx driver
        (which supports 53 USB-ID's in total)
 Who:   Hans de Goede <hdegoede@redhat.com>
+
+----------------------------
+
+What:  corgikbd, spitzkbd, tosakbd driver
+When:  2.6.35
+Files: drivers/input/keyboard/{corgi,spitz,tosa}kbd.c
+Why:   We now have a generic GPIO based matrix keyboard driver that
+       are fully capable of handling all the keys on these devices.
+       The original drivers manipulate the GPIO registers directly
+       and so are difficult to maintain.
+Who:   Eric Miao <eric.y.miao@gmail.com>

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 616a3916d1878d749aa559bafba42501d2760fe8..1ad9435d30aa783c37989f43e4a8b09dd0921812 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -144,13 +144,15 @@ config KEYBOARD_BFIN
          module will be called bf54x-keys.
 
 config KEYBOARD_CORGI
-       tristate "Corgi keyboard"
+       tristate "Corgi keyboard (deprecated)"
        depends on PXA_SHARPSL
-       default y
        help
          Say Y here to enable the keyboard on the Sharp Zaurus SL-C7xx
          series of PDAs.
 
+         This driver is now deprecated, use generic GPIO based matrix
+         keyboard driver instead.
+
          To compile this driver as a module, choose M here: the
          module will be called corgikbd.
 
@@ -338,13 +340,15 @@ config KEYBOARD_PXA930_ROTARY
          module will be called pxa930_rotary.
 
 config KEYBOARD_SPITZ
-       tristate "Spitz keyboard"
+       tristate "Spitz keyboard (deprecated)"
        depends on PXA_SHARPSL
-       default y
        help
          Say Y here to enable the keyboard on the Sharp Zaurus SL-C1000,
          SL-C3000 and Sl-C3100 series of PDAs.
 
+         This driver is now deprecated, use generic GPIO based matrix
+         keyboard driver instead.
+
          To compile this driver as a module, choose M here: the
          module will be called spitzkbd.
 
@@ -411,12 +415,14 @@ config KEYBOARD_TWL4030
          module will be called twl4030_keypad.
 
 config KEYBOARD_TOSA
-       tristate "Tosa keyboard"
+       tristate "Tosa keyboard (deprecated)"
        depends on MACH_TOSA
-       default y
        help
          Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa)
 
+         This driver is now deprecated, use generic GPIO based matrix
+         keyboard driver instead.
+
          To compile this driver as a module, choose M here: the
          module will be called tosakbd.