Commit 1ce31b25 authored by Raphaël Doursenaud's avatar Raphaël Doursenaud Committed by Jiri Kosina
Browse files

HID: add support for cymotion master solar keyboard 



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

Signed-off-by: default avatarRaphaël Doursenaud <rdoursenaud@free.fr>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c0858552

drivers/hid/hid-cherry.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 


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);

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ 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) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,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