On Tue, Feb 9, 2010 at 8:23 PM, Eric Miao <eric.y.miao@xxxxxxxxx> wrote:
> On Tue, Feb 9, 2010 at 5:09 PM, Dmitry Torokhov
> <dmitry.torokhov@xxxxxxxxx> wrote:
>> On Tue, Feb 09, 2010 at 09:15:38AM +0800, Eric Miao wrote:
>>> On Tue, Feb 9, 2010 at 2:06 AM, Pavel Machek <pavel@xxxxxx> wrote:
>>> > On Thu 2010-02-04 16:45:41, Eric Miao wrote:
>>> >> commit 31cec413e534520111716802833675f53ac99b0b
>>> >> Author: Eric Miao <eric.y.miao@xxxxxxxxx>
>>> >> Date: Thu Feb 4 16:41:28 2010 -0800
>>> >>
>>> >> input: schedule corgi_ssp and corgi_ts to be removed
>>> >>
>>> >> Cc: Richard Purdie <rpurdie@xxxxxxxxx>
>>> >> Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
>>> >
>>> > ACK.
>>> >
>>>
>>> Thanks, guys.
>>>
>>> Dmitry, I'm hoping these two patches will go through your tree please?
>>
>> I have it in next, do you want it in .33 instead?
>>
>
> No. -next is good, thanks man.
>
Dmitry,
Attached are the two patches updated, with Pavel's suggestion to make them
default to 'n' and with their Acks. Please consider re-apply, sorry for the
bother.
From e7a31dab10f1e0a6332af2a856b706f093249c94 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Thu, 4 Feb 2010 16:25:19 -0800
Subject: [PATCH 1/2] 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@xxxxxxxxx>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
---
Documentation/feature-removal-schedule.txt | 12 ++++++++++++
drivers/input/keyboard/Kconfig | 21 +++++++++++++++------
2 files changed, 27 insertions(+), 6 deletions(-)
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@xxxxxxxxxx>
+
+----------------------------
+
+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@xxxxxxxxx>
+
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 02c836e..89b4eb0 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
+ default n
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
+ default n
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
+ default n
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.
--
1.6.3.3
From ab5fd913ef1b2e41c768e670851af6aee6334c20 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Thu, 4 Feb 2010 16:41:28 -0800
Subject: [PATCH 2/2] input: schedule corgi_ssp and corgi_ts to be removed
Acked-by: Richard Purdie <rpurdie@xxxxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
---
Documentation/feature-removal-schedule.txt | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 5860583..3a2367e 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -554,3 +554,15 @@ Why: We now have a generic GPIO based matrix keyboard driver that
and so are difficult to maintain.
Who: Eric Miao <eric.y.miao@xxxxxxxxx>
+----------------------------
+
+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 til vsync before ADC sampling is also integrated into
+ ads7846 driver now. Provided that the original driver is not generic
+ and difficult to maintain, it will be removed later.
+Who: Eric Miao <eric.y.miao@xxxxxxxxx>
+
--
1.6.3.3
