Commit 0b21c35f authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.13/lenovo' into for-linus 

- LED fixes and Thinkpad X1 Tablet keyboard support, from Hans de Goede
parents cddbefcc c158c2af

drivers/hid/hid-lenovo.c

+114 −33
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 


#include "hid-ids.h"



/* Userspace expects F20 for mic-mute KEY_MICMUTE does not work */

#define LENOVO_KEY_MICMUTE KEY_F20



struct lenovo_drvdata {

	u8 led_report[3]; /* Must be first for proper alignment */

	int led_state;
@@ -62,7 +65,7 @@ struct lenovo_drvdata { 
#define TP10UBKBD_LED_OFF		1

#define TP10UBKBD_LED_ON		2



static void lenovo_led_set_tp10ubkbd(struct hid_device *hdev, u8 led_code,

static int lenovo_led_set_tp10ubkbd(struct hid_device *hdev, u8 led_code,

				    enum led_brightness value)

{

	struct lenovo_drvdata *data = hid_get_drvdata(hdev);
@@ -75,10 +78,18 @@ static void lenovo_led_set_tp10ubkbd(struct hid_device *hdev, u8 led_code, 
	data->led_report[2] = value ? TP10UBKBD_LED_ON : TP10UBKBD_LED_OFF;

	ret = hid_hw_raw_request(hdev, data->led_report[0], data->led_report, 3,

				 HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);

	if (ret)

	if (ret != 3) {

		if (ret != -ENODEV)

			hid_err(hdev, "Set LED output report error: %d\n", ret);



		ret = ret < 0 ? ret : -EIO;

	} else {

		ret = 0;

	}



	mutex_unlock(&data->led_report_mutex);



	return ret;

}



static void lenovo_tp10ubkbd_sync_fn_lock(struct work_struct *work)
@@ -126,7 +137,7 @@ static int lenovo_input_mapping_tpkbd(struct hid_device *hdev, 
	if (usage->hid == (HID_UP_BUTTON | 0x0010)) {

		/* This sub-device contains trackpoint, mark it */

		hid_set_drvdata(hdev, (void *)1);

		map_key_clear(KEY_MICMUTE);

		map_key_clear(LENOVO_KEY_MICMUTE);

		return 1;

	}

	return 0;
@@ -141,7 +152,7 @@ static int lenovo_input_mapping_cptkbd(struct hid_device *hdev, 
	    (usage->hid & HID_USAGE_PAGE) == HID_UP_LNVENDOR) {

		switch (usage->hid & HID_USAGE) {

		case 0x00f1: /* Fn-F4: Mic mute */

			map_key_clear(KEY_MICMUTE);

			map_key_clear(LENOVO_KEY_MICMUTE);

			return 1;

		case 0x00f2: /* Fn-F5: Brightness down */

			map_key_clear(KEY_BRIGHTNESSDOWN);
@@ -231,7 +242,7 @@ static int lenovo_input_mapping_tp10_ultrabook_kbd(struct hid_device *hdev, 
			map_key_clear(KEY_FN_ESC);

			return 1;

		case 9: /* Fn-F4: Mic mute */

			map_key_clear(KEY_MICMUTE);

			map_key_clear(LENOVO_KEY_MICMUTE);

			return 1;

		case 10: /* Fn-F7: Control panel */

			map_key_clear(KEY_CONFIG);
@@ -255,6 +266,54 @@ static int lenovo_input_mapping_tp10_ultrabook_kbd(struct hid_device *hdev, 
	return 0;

}



static int lenovo_input_mapping_x1_tab_kbd(struct hid_device *hdev,

		struct hid_input *hi, struct hid_field *field,

		struct hid_usage *usage, unsigned long **bit, int *max)

{

	/*

	 * The ThinkPad X1 Tablet Thin Keyboard uses 0x000c0001 usage for

	 * a bunch of keys which have no standard consumer page code.

	 */

	if (usage->hid == 0x000c0001) {

		switch (usage->usage_index) {

		case 0: /* Fn-F10: Enable/disable bluetooth */

			map_key_clear(KEY_BLUETOOTH);

			return 1;

		case 1: /* Fn-F11: Keyboard settings */

			map_key_clear(KEY_KEYBOARD);

			return 1;

		case 2: /* Fn-F12: User function / Cortana */

			map_key_clear(KEY_MACRO1);

			return 1;

		case 3: /* Fn-PrtSc: Snipping tool */

			map_key_clear(KEY_SELECTIVE_SCREENSHOT);

			return 1;

		case 8: /* Fn-Esc: Fn-lock toggle */

			map_key_clear(KEY_FN_ESC);

			return 1;

		case 9: /* Fn-F4: Mute/unmute microphone */

			map_key_clear(KEY_MICMUTE);

			return 1;

		case 10: /* Fn-F9: Settings */

			map_key_clear(KEY_CONFIG);

			return 1;

		case 13: /* Fn-F7: Manage external displays */

			map_key_clear(KEY_SWITCHVIDEOMODE);

			return 1;

		case 14: /* Fn-F8: Enable/disable wifi */

			map_key_clear(KEY_WLAN);

			return 1;

		}

	}



	if (usage->hid == (HID_UP_KEYBOARD | 0x009a)) {

		map_key_clear(KEY_SYSRQ);

		return 1;

	}



	return 0;

}



static int lenovo_input_mapping(struct hid_device *hdev,

		struct hid_input *hi, struct hid_field *field,

		struct hid_usage *usage, unsigned long **bit, int *max)
@@ -278,6 +337,8 @@ static int lenovo_input_mapping(struct hid_device *hdev, 
	case USB_DEVICE_ID_LENOVO_TP10UBKBD:

		return lenovo_input_mapping_tp10_ultrabook_kbd(hdev, hi, field,

							       usage, bit, max);

	case USB_DEVICE_ID_LENOVO_X1_TAB:

		return lenovo_input_mapping_x1_tab_kbd(hdev, hi, field, usage, bit, max);

	default:

		return 0;

	}
@@ -349,7 +410,7 @@ static ssize_t attr_fn_lock_store(struct device *dev, 
{

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata *data = hid_get_drvdata(hdev);

	int value;

	int value, ret;



	if (kstrtoint(buf, 10, &value))

		return -EINVAL;
@@ -364,7 +425,10 @@ static ssize_t attr_fn_lock_store(struct device *dev, 
		lenovo_features_set_cptkbd(hdev);

		break;

	case USB_DEVICE_ID_LENOVO_TP10UBKBD:

		lenovo_led_set_tp10ubkbd(hdev, TP10UBKBD_FN_LOCK_LED, value);

	case USB_DEVICE_ID_LENOVO_X1_TAB:

		ret = lenovo_led_set_tp10ubkbd(hdev, TP10UBKBD_FN_LOCK_LED, value);

		if (ret)

			return ret;

		break;

	}
@@ -498,11 +562,15 @@ static int lenovo_event_cptkbd(struct hid_device *hdev, 
static int lenovo_event(struct hid_device *hdev, struct hid_field *field,

		struct hid_usage *usage, __s32 value)

{

	if (!hid_get_drvdata(hdev))

		return 0;



	switch (hdev->product) {

	case USB_DEVICE_ID_LENOVO_CUSBKBD:

	case USB_DEVICE_ID_LENOVO_CBTKBD:

		return lenovo_event_cptkbd(hdev, field, usage, value);

	case USB_DEVICE_ID_LENOVO_TP10UBKBD:

	case USB_DEVICE_ID_LENOVO_X1_TAB:

		return lenovo_event_tp10ubkbd(hdev, field, usage, value);

	default:

		return 0;
@@ -761,23 +829,7 @@ static void lenovo_led_set_tpkbd(struct hid_device *hdev) 
	hid_hw_request(hdev, report, HID_REQ_SET_REPORT);

}



static enum led_brightness lenovo_led_brightness_get(

			struct led_classdev *led_cdev)

{

	struct device *dev = led_cdev->dev->parent;

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata *data_pointer = hid_get_drvdata(hdev);

	int led_nr = 0;



	if (led_cdev == &data_pointer->led_micmute)

		led_nr = 1;



	return data_pointer->led_state & (1 << led_nr)

				? LED_FULL

				: LED_OFF;

}



static void lenovo_led_brightness_set(struct led_classdev *led_cdev,

static int lenovo_led_brightness_set(struct led_classdev *led_cdev,

			enum led_brightness value)

{

	struct device *dev = led_cdev->dev->parent;
@@ -785,6 +837,7 @@ static void lenovo_led_brightness_set(struct led_classdev *led_cdev, 
	struct lenovo_drvdata *data_pointer = hid_get_drvdata(hdev);

	u8 tp10ubkbd_led[] = { TP10UBKBD_MUTE_LED, TP10UBKBD_MICMUTE_LED };

	int led_nr = 0;

	int ret = 0;



	if (led_cdev == &data_pointer->led_micmute)

		led_nr = 1;
@@ -799,9 +852,12 @@ static void lenovo_led_brightness_set(struct led_classdev *led_cdev, 
		lenovo_led_set_tpkbd(hdev);

		break;

	case USB_DEVICE_ID_LENOVO_TP10UBKBD:

		lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value);

	case USB_DEVICE_ID_LENOVO_X1_TAB:

		ret = lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value);

		break;

	}



	return ret;

}



static int lenovo_register_leds(struct hid_device *hdev)
@@ -821,16 +877,20 @@ static int lenovo_register_leds(struct hid_device *hdev) 
	snprintf(name_micm, name_sz, "%s:amber:micmute", dev_name(&hdev->dev));



	data->led_mute.name = name_mute;

	data->led_mute.brightness_get = lenovo_led_brightness_get;

	data->led_mute.brightness_set = lenovo_led_brightness_set;

	data->led_mute.default_trigger = "audio-mute";

	data->led_mute.brightness_set_blocking = lenovo_led_brightness_set;

	data->led_mute.max_brightness = 1;

	data->led_mute.flags = LED_HW_PLUGGABLE;

	data->led_mute.dev = &hdev->dev;

	ret = led_classdev_register(&hdev->dev, &data->led_mute);

	if (ret < 0)

		return ret;



	data->led_micmute.name = name_micm;

	data->led_micmute.brightness_get = lenovo_led_brightness_get;

	data->led_micmute.brightness_set = lenovo_led_brightness_set;

	data->led_micmute.default_trigger = "audio-micmute";

	data->led_micmute.brightness_set_blocking = lenovo_led_brightness_set;

	data->led_micmute.max_brightness = 1;

	data->led_micmute.flags = LED_HW_PLUGGABLE;

	data->led_micmute.dev = &hdev->dev;

	ret = led_classdev_register(&hdev->dev, &data->led_micmute);

	if (ret < 0) {
@@ -952,11 +1012,24 @@ static const struct attribute_group lenovo_attr_group_tp10ubkbd = { 


static int lenovo_probe_tp10ubkbd(struct hid_device *hdev)

{

	struct hid_report_enum *rep_enum;

	struct lenovo_drvdata *data;

	struct hid_report *rep;

	bool found;

	int ret;



	/* All the custom action happens on the USBMOUSE device for USB */

	if (hdev->type != HID_TYPE_USBMOUSE)

	/*

	 * The LEDs and the Fn-lock functionality use output report 9,

	 * with an application of 0xffa0001, add the LEDs on the interface

	 * with this output report.

	 */

	found = false;

	rep_enum = &hdev->report_enum[HID_OUTPUT_REPORT];

	list_for_each_entry(rep, &rep_enum->report_list, list) {

		if (rep->application == 0xffa00001)

			found = true;

	}

	if (!found)

		return 0;



	data = devm_kzalloc(&hdev->dev, sizeof(*data), GFP_KERNEL);
@@ -1018,6 +1091,7 @@ static int lenovo_probe(struct hid_device *hdev, 
		ret = lenovo_probe_cptkbd(hdev);

		break;

	case USB_DEVICE_ID_LENOVO_TP10UBKBD:

	case USB_DEVICE_ID_LENOVO_X1_TAB:

		ret = lenovo_probe_tp10ubkbd(hdev);

		break;

	default:
@@ -1083,6 +1157,7 @@ static void lenovo_remove(struct hid_device *hdev) 
		lenovo_remove_cptkbd(hdev);

		break;

	case USB_DEVICE_ID_LENOVO_TP10UBKBD:

	case USB_DEVICE_ID_LENOVO_X1_TAB:

		lenovo_remove_tp10ubkbd(hdev);

		break;

	}
@@ -1122,6 +1197,12 @@ static const struct hid_device_id lenovo_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_SCROLLPOINT_800DPI_OPTICAL_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TP10UBKBD) },

	/*

	 * Note bind to the HID_GROUP_GENERIC group, so that we only bind to the keyboard

	 * part, while letting hid-multitouch.c handle the touchpad and trackpoint.

	 */

	{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,

		     USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_TAB) },

	{ }

};