[PATCH 2.6.33.2 1/1] hid: add support for cymotion master solar keyboard

[PATCH 2.6.33.2 1/1] hid: add support for cymotion master solar keyboard

[Raphaël Doursenaud]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

Support the solar version of the Cherry's cymotion keyboard line using
existing cherry driver.

Signed-off-by: Raphaël Doursenaud <rdoursenaud@free.fr>

[-- Attachment #2: cymotionsolar.patch --]
[-- Type: text/plain, Size: 1676 bytes --]

--- linux-2.6.33.2.vanilla/drivers/hid/hid-cherry.c	2010-02-24 19:52:17.000000000 +0100
+++ linux-2.6.33.2.cherry/drivers/hid/hid-cherry.c	2010-04-02 04:36:08.955925838 +0200
@@ -59,6 +59,7 @@ static int ch_input_mapping(struct hid_d
 
 static const struct hid_device_id ch_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, ch_devices);
--- linux-2.6.33.2.vanilla/drivers/hid/hid-core.c	2010-04-07 21:46:31.583115372 +0200
+++ linux-2.6.33.3.cherry/drivers/hid/hid-core.c	2010-04-02 04:33:05.796955041 +0200
@@ -1292,6 +1292,7 @@ static const struct hid_device_id hid_bl
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
--- linux-2.6.33.2.vanilla/drivers/hid/hid-ids.h	2010-04-07 21:46:31.583115372 +0200
+++ linux-2.6.33.1.cherry/drivers/hid/hid-ids.h	2010-04-02 04:31:21.696814239 +0200
@@ -124,6 +124,7 @@
 
 #define USB_VENDOR_ID_CHERRY		0x046a
 #define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023
+#define USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR	0x0027
 
 #define USB_VENDOR_ID_CHIC		0x05fe
 #define USB_DEVICE_ID_CHIC_GAMEPAD	0x0014

Re: [PATCH 2.6.33.2 1/1] hid: add support for cymotion master solar keyboard

[Jiri Kosina]

On Thu, 8 Apr 2010, Raphaël Doursenaud wrote:

> Support the solar version of the Cherry's cymotion keyboard line using
> existing cherry driver.
> 
> Signed-off-by: Raphaël Doursenaud <rdoursenaud@free.fr>

Applied, thank you Raphaël.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.