Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2f10b7e authored by Daniel Drake's avatar Daniel Drake Committed by Jiri Kosina
Browse files

HID: chicony: Add support for another ASUS Zen AiO keyboard 



Add support for media keys on the keyboard that comes with the
Asus V221ID and ZN241IC All In One computers.

The keys to support here are WLAN, BRIGHTNESSDOWN and BRIGHTNESSUP.

This device is not visibly branded as Chicony, and the USB Vendor ID
suggests that it is a JESS device. However this seems like the right place
to put it: the usage codes are identical to the currently supported
devices, and this driver already supports the ASUS AIO keyboard AK1D.

Signed-off-by: default avatarDaniel Drake <drake@endlessm.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 2fa299a9

drivers/hid/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -175,11 +175,11 @@ config HID_CHERRY 
	Support for Cherry Cymotion keyboard.



config HID_CHICONY

	tristate "Chicony Tactical pad"

	tristate "Chicony devices"

	depends on HID

	default !EXPERT

	---help---

	Support for Chicony Tactical pad.

	Support for Chicony Tactical pad and special keys on Chicony keyboards.



config HID_CORSAIR

	tristate "Corsair devices"

drivers/hid/hid-chicony.c

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static const struct hid_device_id ch_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_ACER_SWITCH12) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_JESS_ZEN_AIO_KBD) },

	{ }

};

MODULE_DEVICE_TABLE(hid, ch_devices);

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1910,6 +1910,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A0C2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_JESS_ZEN_AIO_KBD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ 


#define USB_VENDOR_ID_JESS		0x0c45

#define USB_DEVICE_ID_JESS_YUREX	0x1010

#define USB_DEVICE_ID_JESS_ZEN_AIO_KBD	0x5112



#define USB_VENDOR_ID_JESS2		0x0f30

#define USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD 0x0111