[PATCH] input: mark {corgi,spitz,tosa}kbd driver deprecated

[PATCH] input: mark {corgi,spitz,tosa}kbd driver deprecated

[Eric Miao]

commit a527bd8d900b77aa48fbc117b28f678e937275d7
Author: Eric Miao <eric.y.miao@gmail.com>
Date:   Thu Feb 4 16:25:19 2010 -0800

    input: mark {corgi,spitz,tosa}kbd driver deprecated

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

    Cc: Richard Purdie <rpurdie@rpsys.net>
    Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
    Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

diff --git a/Documentation/feature-removal-schedule.txt
b/Documentation/feature-removal-schedule.txt
index 0a46833..5860583 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -542,3 +542,15 @@ 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 02c836e..3d131cc 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -144,13 +144,16 @@ 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.

@@ -329,13 +332,16 @@ 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.

@@ -402,12 +408,15 @@ 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.

Re: [PATCH] input: mark {corgi,spitz,tosa}kbd driver deprecated

[Pavel Machek]

Hi!

>     input: mark {corgi,spitz,tosa}kbd driver deprecated
> 
>     Provided that now keyboards on these devices are now fully supported
>     by generic GPIO based matrix keypad driver, mark these hardcoded, and
>     difficult to maintain drivers deprecated in favour of this.
> 
>     Cc: Richard Purdie <rpurdie@rpsys.net>
>     Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
>     Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

ACK, but..

> @@ -329,13 +332,16 @@ 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

Default should be N, and config option probably should be removed
altogether -- with recent mach_spitz, keyboard_spitz will not be bound
to the hw, anyway... right?

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html