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

Commit 287b8e11 authored by Masaki Ota's avatar Masaki Ota Committed by Jiri Kosina
Browse files

HID: alps: add new U1 device ID 



Add new U1 device Product ID This device is used on HP Elite book x360 series.

[jkosina@suse.cz: update changelog]
Signed-off-by: default avatarMasaki Ota <masaki.ota@jp.alps.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 73196ebe

drivers/hid/hid-alps.c

+3 −0
Original line number Diff line number Diff line
@@ -767,6 +767,7 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		data->dev_type = T4;

		break;

	case HID_DEVICE_ID_ALPS_U1_DUAL:

	case HID_DEVICE_ID_ALPS_U1:

		data->dev_type = U1;

		break;

	default:
@@ -790,6 +791,8 @@ static void alps_remove(struct hid_device *hdev) 
static const struct hid_device_id alps_id[] = {

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,

		USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,

		USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) },

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,

		USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) },

	{ }

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1890,6 +1890,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
#if IS_ENABLED(CONFIG_HID_ALPS)

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) },

#endif

#if IS_ENABLED(CONFIG_HID_APPLE)

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
#define HID_DEVICE_ID_ALPS_U1_DUAL	0x120B

#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP	0x121F

#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP	0x1220

#define HID_DEVICE_ID_ALPS_U1		0x1215

#define HID_DEVICE_ID_ALPS_T4_BTNLESS	0x120C