Commit 20df1578 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

Pull HID updates from Jiri Kosina:

 - high resolution mode for Dell canvas support, from Benjamin Tissoires

 - pen handling fixes for the Wacom driver, from Jason Gerecke

 - i2c-hid: Apollo-Lake based laptops improvements, from Hans de Goede

 - Input/Core: eraser tool support, from Ping Cheng

 - new ALPS touchpad (T4, found currently on HP EliteBook 1000, Zbook
   Stduio and HP Elite book x360) supportm from Masaki Ota

 - other smaller assorted fixes

* 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (33 commits)
  HID: cp2112: fix broken gpio_direction_input callback
  HID: cp2112: fix interface specification URL
  HID: Wacom: switch Dell canvas into highres mode
  HID: wacom: generic: Send BTN_STYLUS3 when both barrel switches are set
  HID: sony: Fix SHANWAN pad rumbling on USB
  HID: i2c-hid: Add no-irq-after-reset quirk for 0911:5288 device
  HID: add backlight level quirk for Asus ROG laptops
  HID: cp2112: add HIDRAW dependency
  HID: Add ID 044f:b605 ThrustMaster, Inc. force feedback Racing Wheel
  HID: hid-logitech: remove redundant assignment to pointer value
  HID: wacom: generic: Recognize WACOM_HID_WD_PEN as a type of pen collection
  HID: rmi: Check that a device is a RMI device before calling RMI functions
  HID: add multi-input quirk for GamepadBlock
  HID: alps: add new U1 device ID
  HID: alps: add support for Alps T4 Touchpad device
  HID: alps: remove variables local to u1_init() from the device struct
  HID: alps: properly handle max_fingers and minimum on X and Y axis
  HID: alps: Separate U1 device code
  HID: alps: delete unnecessary struct u1_dev devInfo
  HID: usbhid: Convert timers to use timer_setup()
  ...
parents 37cb8e1f 01125b2d

drivers/hid/Kconfig

+2 −3
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ config HID_CMEDIA 




config HID_CP2112

config HID_CP2112

	tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support"

	tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support"

	depends on USB_HID && I2C && GPIOLIB

	depends on USB_HID && HIDRAW && I2C && GPIOLIB

	select GPIOLIB_IRQCHIP

	select GPIOLIB_IRQCHIP

	---help---

	---help---

	Support for Silicon Labs CP2112 HID USB to SMBus Master Bridge.

	Support for Silicon Labs CP2112 HID USB to SMBus Master Bridge.
@@ -750,11 +750,10 @@ config HID_PRIMAX 
	HID standard.

	HID standard.





config HID_RETRODE

config HID_RETRODE

	tristate "Retrode"

	tristate "Retrode 2 USB adapter for vintage video games"

	depends on USB_HID

	depends on USB_HID

	---help---

	---help---

	Support for

	Support for



	  * Retrode 2 cartridge and controller adapter

	  * Retrode 2 cartridge and controller adapter





config HID_ROCCAT

config HID_ROCCAT

drivers/hid/hid-alps.c

+416 −104
Original line number Original line Diff line number Diff line
@@ -52,8 +52,30 @@ 
#define ADDRESS_U1_PAD_BTN		0x00800052

#define ADDRESS_U1_PAD_BTN		0x00800052

#define ADDRESS_U1_SP_BTN		0x0080009F

#define ADDRESS_U1_SP_BTN		0x0080009F





#define T4_INPUT_REPORT_LEN			sizeof(struct t4_input_report)

#define T4_FEATURE_REPORT_LEN		T4_INPUT_REPORT_LEN

#define T4_FEATURE_REPORT_ID		7

#define T4_CMD_REGISTER_READ			0x08

#define T4_CMD_REGISTER_WRITE			0x07



#define T4_ADDRESS_BASE				0xC2C0

#define PRM_SYS_CONFIG_1			(T4_ADDRESS_BASE + 0x0002)

#define T4_PRM_FEED_CONFIG_1		(T4_ADDRESS_BASE + 0x0004)

#define T4_PRM_FEED_CONFIG_4		(T4_ADDRESS_BASE + 0x001A)

#define T4_PRM_ID_CONFIG_3			(T4_ADDRESS_BASE + 0x00B0)





#define T4_FEEDCFG4_ADVANCED_ABS_ENABLE			0x01

#define T4_I2C_ABS	0x78



#define T4_COUNT_PER_ELECTRODE		256

#define MAX_TOUCHES	5

#define MAX_TOUCHES	5





enum dev_num {

	U1,

	T4,

	UNKNOWN,

};

/**

/**

 * struct u1_data

 * struct u1_data

 *

 *
@@ -61,43 +83,173 @@ 
 * @input2: pointer to the kernel input2 device

 * @input2: pointer to the kernel input2 device

 * @hdev: pointer to the struct hid_device

 * @hdev: pointer to the struct hid_device

 *

 *

 * @dev_ctrl: device control parameter

 * @dev_type: device type

 * @dev_type: device type

 * @sen_line_num_x: number of sensor line of X

 * @max_fingers: total number of fingers

 * @sen_line_num_y: number of sensor line of Y

 * @has_sp: boolean of sp existense

 * @pitch_x: sensor pitch of X

 * @sp_btn_info: button information

 * @pitch_y: sensor pitch of Y

 * @resolution: resolution

 * @btn_info: button information

 * @x_active_len_mm: active area length of X (mm)

 * @x_active_len_mm: active area length of X (mm)

 * @y_active_len_mm: active area length of Y (mm)

 * @y_active_len_mm: active area length of Y (mm)

 * @x_max: maximum x coordinate value

 * @x_max: maximum x coordinate value

 * @y_max: maximum y coordinate value

 * @y_max: maximum y coordinate value

 * @x_min: minimum x coordinate value

 * @y_min: minimum y coordinate value

 * @btn_cnt: number of buttons

 * @btn_cnt: number of buttons

 * @sp_btn_cnt: number of stick buttons

 * @sp_btn_cnt: number of stick buttons

 */

 */

struct u1_dev {

struct alps_dev {

	struct input_dev *input;

	struct input_dev *input;

	struct input_dev *input2;

	struct input_dev *input2;

	struct hid_device *hdev;

	struct hid_device *hdev;





	u8	dev_ctrl;

	enum dev_num dev_type;

	u8	dev_type;

	u8  max_fingers;

	u8	sen_line_num_x;

	u8  has_sp;

	u8	sen_line_num_y;

	u8	pitch_x;

	u8	pitch_y;

	u8	resolution;

	u8	btn_info;

	u8	sp_btn_info;

	u8	sp_btn_info;

	u32	x_active_len_mm;

	u32	x_active_len_mm;

	u32	y_active_len_mm;

	u32	y_active_len_mm;

	u32	x_max;

	u32	x_max;

	u32	y_max;

	u32	y_max;

	u32	x_min;

	u32	y_min;

	u32	btn_cnt;

	u32	btn_cnt;

	u32	sp_btn_cnt;

	u32	sp_btn_cnt;

};

};





struct t4_contact_data {

	u8  palm;

	u8	x_lo;

	u8	x_hi;

	u8	y_lo;

	u8	y_hi;

};



struct t4_input_report {

	u8  reportID;

	u8  numContacts;

	struct t4_contact_data contact[5];

	u8  button;

	u8  track[5];

	u8  zx[5], zy[5];

	u8  palmTime[5];

	u8  kilroy;

	u16 timeStamp;

};



static u16 t4_calc_check_sum(u8 *buffer,

		unsigned long offset, unsigned long length)

{

	u16 sum1 = 0xFF, sum2 = 0xFF;

	unsigned long i = 0;



	if (offset + length >= 50)

		return 0;



	while (length > 0) {

		u32 tlen = length > 20 ? 20 : length;



		length -= tlen;



		do {

			sum1 += buffer[offset + i];

			sum2 += sum1;

			i++;

		} while (--tlen > 0);



		sum1 = (sum1 & 0xFF) + (sum1 >> 8);

		sum2 = (sum2 & 0xFF) + (sum2 >> 8);

	}



	sum1 = (sum1 & 0xFF) + (sum1 >> 8);

	sum2 = (sum2 & 0xFF) + (sum2 >> 8);



	return(sum2 << 8 | sum1);

}



static int t4_read_write_register(struct hid_device *hdev, u32 address,

	u8 *read_val, u8 write_val, bool read_flag)

{

	int ret;

	u16 check_sum;

	u8 *input;

	u8 *readbuf;



	input = kzalloc(T4_FEATURE_REPORT_LEN, GFP_KERNEL);

	if (!input)

		return -ENOMEM;



	input[0] = T4_FEATURE_REPORT_ID;

	if (read_flag) {

		input[1] = T4_CMD_REGISTER_READ;

		input[8] = 0x00;

	} else {

		input[1] = T4_CMD_REGISTER_WRITE;

		input[8] = write_val;

	}

	put_unaligned_le32(address, input + 2);

	input[6] = 1;

	input[7] = 0;



	/* Calculate the checksum */

	check_sum = t4_calc_check_sum(input, 1, 8);

	input[9] = (u8)check_sum;

	input[10] = (u8)(check_sum >> 8);

	input[11] = 0;



	ret = hid_hw_raw_request(hdev, T4_FEATURE_REPORT_ID, input,

			T4_FEATURE_REPORT_LEN,

			HID_FEATURE_REPORT, HID_REQ_SET_REPORT);



	if (ret < 0) {

		dev_err(&hdev->dev, "failed to read command (%d)\n", ret);

		goto exit;

	}



	readbuf = kzalloc(T4_FEATURE_REPORT_LEN, GFP_KERNEL);

	if (read_flag) {

		if (!readbuf) {

			ret = -ENOMEM;

			goto exit;

		}



		ret = hid_hw_raw_request(hdev, T4_FEATURE_REPORT_ID, readbuf,

				T4_FEATURE_REPORT_LEN,

				HID_FEATURE_REPORT, HID_REQ_GET_REPORT);

		if (ret < 0) {

			dev_err(&hdev->dev, "failed read register (%d)\n", ret);

			goto exit_readbuf;

		}



		if (*(u32 *)&readbuf[6] != address) {

			dev_err(&hdev->dev, "read register address error (%x,%x)\n",

			*(u32 *)&readbuf[6], address);

			goto exit_readbuf;

		}



		if (*(u16 *)&readbuf[10] != 1) {

			dev_err(&hdev->dev, "read register size error (%x)\n",

			*(u16 *)&readbuf[10]);

			goto exit_readbuf;

		}



		check_sum = t4_calc_check_sum(readbuf, 6, 7);

		if (*(u16 *)&readbuf[13] != check_sum) {

			dev_err(&hdev->dev, "read register checksum error (%x,%x)\n",

			*(u16 *)&readbuf[13], check_sum);

			goto exit_readbuf;

		}



		*read_val = readbuf[12];

	}



	ret = 0;



exit_readbuf:

	kfree(readbuf);

exit:

	kfree(input);

	return ret;

}



static int u1_read_write_register(struct hid_device *hdev, u32 address,

static int u1_read_write_register(struct hid_device *hdev, u32 address,

	u8 *read_val, u8 write_val, bool read_flag)

	u8 *read_val, u8 write_val, bool read_flag)

{

{
@@ -165,21 +317,60 @@ exit: 
	return ret;

	return ret;

}

}





static int alps_raw_event(struct hid_device *hdev,

static int t4_raw_event(struct alps_dev *hdata, u8 *data, int size)

		struct hid_report *report, u8 *data, int size)

{

	unsigned int x, y, z;

	int i;

	struct t4_input_report *p_report = (struct t4_input_report *)data;



	if (!data)

		return 0;

	for (i = 0; i < hdata->max_fingers; i++) {

		x = p_report->contact[i].x_hi << 8 | p_report->contact[i].x_lo;

		y = p_report->contact[i].y_hi << 8 | p_report->contact[i].y_lo;

		y = hdata->y_max - y + hdata->y_min;

		z = (p_report->contact[i].palm < 0x80 &&

			p_report->contact[i].palm > 0) * 62;

		if (x == 0xffff) {

			x = 0;

			y = 0;

			z = 0;

		}

		input_mt_slot(hdata->input, i);



		input_mt_report_slot_state(hdata->input,

			MT_TOOL_FINGER, z != 0);



		if (!z)

			continue;



		input_report_abs(hdata->input, ABS_MT_POSITION_X, x);

		input_report_abs(hdata->input, ABS_MT_POSITION_Y, y);

		input_report_abs(hdata->input, ABS_MT_PRESSURE, z);

	}

	input_mt_sync_frame(hdata->input);



	input_report_key(hdata->input, BTN_LEFT, p_report->button);



	input_sync(hdata->input);

	return 1;

}



static int u1_raw_event(struct alps_dev *hdata, u8 *data, int size)

{

{

	unsigned int x, y, z;

	unsigned int x, y, z;

	int i;

	int i;

	short sp_x, sp_y;

	short sp_x, sp_y;

	struct u1_dev *hdata = hid_get_drvdata(hdev);





	if (!data)

		return 0;

	switch (data[0]) {

	switch (data[0]) {

	case U1_MOUSE_REPORT_ID:

	case U1_MOUSE_REPORT_ID:

		break;

		break;

	case U1_FEATURE_REPORT_ID:

	case U1_FEATURE_REPORT_ID:

		break;

		break;

	case U1_ABSOLUTE_REPORT_ID:

	case U1_ABSOLUTE_REPORT_ID:

		for (i = 0; i < MAX_TOUCHES; i++) {

		for (i = 0; i < hdata->max_fingers; i++) {

			u8 *contact = &data[i * 5];

			u8 *contact = &data[i * 5];





			x = get_unaligned_le16(contact + 3);

			x = get_unaligned_le16(contact + 3);
@@ -241,122 +432,253 @@ static int alps_raw_event(struct hid_device *hdev, 
	return 0;

	return 0;

}

}





#ifdef CONFIG_PM

static int alps_raw_event(struct hid_device *hdev,

static int alps_post_reset(struct hid_device *hdev)

		struct hid_report *report, u8 *data, int size)

{

{

	return u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,

	int ret = 0;

				NULL, U1_TP_ABS_MODE | U1_SP_ABS_MODE, false);

	struct alps_dev *hdata = hid_get_drvdata(hdev);



	switch (hdev->product) {

	case HID_PRODUCT_ID_T4_BTNLESS:

		ret = t4_raw_event(hdata, data, size);

		break;

	default:

		ret = u1_raw_event(hdata, data, size);

		break;

	}

	return ret;

}

}





static int alps_post_resume(struct hid_device *hdev)

static int __maybe_unused alps_post_reset(struct hid_device *hdev)

{

{

	return u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,

	int ret = -1;

				NULL, U1_TP_ABS_MODE | U1_SP_ABS_MODE, false);

	struct alps_dev *data = hid_get_drvdata(hdev);



	switch (data->dev_type) {

	case T4:

		ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_1,

			NULL, T4_I2C_ABS, false);

		ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_4,

			NULL, T4_FEEDCFG4_ADVANCED_ABS_ENABLE, false);

		break;

	case U1:

		ret = u1_read_write_register(hdev,

			ADDRESS_U1_DEV_CTRL_1, NULL,

			U1_TP_ABS_MODE | U1_SP_ABS_MODE, false);

		break;

	default:

		break;

	}

	return ret;

}

}

#endif /* CONFIG_PM */





static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)

static int __maybe_unused alps_post_resume(struct hid_device *hdev)

{

{

	struct u1_dev *data = hid_get_drvdata(hdev);

	return alps_post_reset(hdev);

	struct input_dev *input = hi->input, *input2;

}

	struct u1_dev devInfo;

	int ret;

	int res_x, res_y, i;



	data->input = input;



	hid_dbg(hdev, "Opening low level driver\n");

	ret = hid_hw_open(hdev);

	if (ret)

		return ret;





	/* Allow incoming hid reports */

static int u1_init(struct hid_device *hdev, struct alps_dev *pri_data)

	hid_device_io_start(hdev);

{

	int ret;

	u8 tmp, dev_ctrl, sen_line_num_x, sen_line_num_y;

	u8 pitch_x, pitch_y, resolution;





	/* Device initialization */

	/* Device initialization */

	ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,

	ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,

			&devInfo.dev_ctrl, 0, true);

			&dev_ctrl, 0, true);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&hdev->dev, "failed U1_DEV_CTRL_1 (%d)\n", ret);

		dev_err(&hdev->dev, "failed U1_DEV_CTRL_1 (%d)\n", ret);

		goto exit;

		goto exit;

	}

	}





	devInfo.dev_ctrl &= ~U1_DISABLE_DEV;

	dev_ctrl &= ~U1_DISABLE_DEV;

	devInfo.dev_ctrl |= U1_TP_ABS_MODE;

	dev_ctrl |= U1_TP_ABS_MODE;

	ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,

	ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,

			NULL, devInfo.dev_ctrl, false);

			NULL, dev_ctrl, false);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&hdev->dev, "failed to change TP mode (%d)\n", ret);

		dev_err(&hdev->dev, "failed to change TP mode (%d)\n", ret);

		goto exit;

		goto exit;

	}

	}





	ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_X,

	ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_X,

			&devInfo.sen_line_num_x, 0, true);

			&sen_line_num_x, 0, true);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&hdev->dev, "failed U1_NUM_SENS_X (%d)\n", ret);

		dev_err(&hdev->dev, "failed U1_NUM_SENS_X (%d)\n", ret);

		goto exit;

		goto exit;

	}

	}





	ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_Y,

	ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_Y,

			&devInfo.sen_line_num_y, 0, true);

			&sen_line_num_y, 0, true);

		if (ret < 0) {

		if (ret < 0) {

		dev_err(&hdev->dev, "failed U1_NUM_SENS_Y (%d)\n", ret);

		dev_err(&hdev->dev, "failed U1_NUM_SENS_Y (%d)\n", ret);

		goto exit;

		goto exit;

	}

	}





	ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_X,

	ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_X,

			&devInfo.pitch_x, 0, true);

			&pitch_x, 0, true);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&hdev->dev, "failed U1_PITCH_SENS_X (%d)\n", ret);

		dev_err(&hdev->dev, "failed U1_PITCH_SENS_X (%d)\n", ret);

		goto exit;

		goto exit;

	}

	}





	ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_Y,

	ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_Y,

			&devInfo.pitch_y, 0, true);

			&pitch_y, 0, true);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&hdev->dev, "failed U1_PITCH_SENS_Y (%d)\n", ret);

		dev_err(&hdev->dev, "failed U1_PITCH_SENS_Y (%d)\n", ret);

		goto exit;

		goto exit;

	}

	}





	ret = u1_read_write_register(hdev, ADDRESS_U1_RESO_DWN_ABS,

	ret = u1_read_write_register(hdev, ADDRESS_U1_RESO_DWN_ABS,

		&devInfo.resolution, 0, true);

		&resolution, 0, true);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&hdev->dev, "failed U1_RESO_DWN_ABS (%d)\n", ret);

		dev_err(&hdev->dev, "failed U1_RESO_DWN_ABS (%d)\n", ret);

		goto exit;

		goto exit;

	}

	}

	pri_data->x_active_len_mm =

		(pitch_x * (sen_line_num_x - 1)) / 10;

	pri_data->y_active_len_mm =

		(pitch_y * (sen_line_num_y - 1)) / 10;



	pri_data->x_max =

		(resolution << 2) * (sen_line_num_x - 1);

	pri_data->x_min = 1;

	pri_data->y_max =

		(resolution << 2) * (sen_line_num_y - 1);

	pri_data->y_min = 1;





	ret = u1_read_write_register(hdev, ADDRESS_U1_PAD_BTN,

	ret = u1_read_write_register(hdev, ADDRESS_U1_PAD_BTN,

			&devInfo.btn_info, 0, true);

			&tmp, 0, true);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&hdev->dev, "failed U1_PAD_BTN (%d)\n", ret);

		dev_err(&hdev->dev, "failed U1_PAD_BTN (%d)\n", ret);

		goto exit;

		goto exit;

	}

	}

	if ((tmp & 0x0F) == (tmp & 0xF0) >> 4) {

		pri_data->btn_cnt = (tmp & 0x0F);

	} else {

		/* Button pad */

		pri_data->btn_cnt = 1;

	}





	pri_data->has_sp = 0;

	/* Check StickPointer device */

	/* Check StickPointer device */

	ret = u1_read_write_register(hdev, ADDRESS_U1_DEVICE_TYP,

	ret = u1_read_write_register(hdev, ADDRESS_U1_DEVICE_TYP,

			&devInfo.dev_type, 0, true);

			&tmp, 0, true);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&hdev->dev, "failed U1_DEVICE_TYP (%d)\n", ret);

		dev_err(&hdev->dev, "failed U1_DEVICE_TYP (%d)\n", ret);

		goto exit;

		goto exit;

	}

	}

	if (tmp & U1_DEVTYPE_SP_SUPPORT) {

		dev_ctrl |= U1_SP_ABS_MODE;

		ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,

			NULL, dev_ctrl, false);

		if (ret < 0) {

			dev_err(&hdev->dev, "failed SP mode (%d)\n", ret);

			goto exit;

		}



		ret = u1_read_write_register(hdev, ADDRESS_U1_SP_BTN,

			&pri_data->sp_btn_info, 0, true);

		if (ret < 0) {

			dev_err(&hdev->dev, "failed U1_SP_BTN (%d)\n", ret);

			goto exit;

		}

		pri_data->has_sp = 1;

	}

	pri_data->max_fingers = 5;

exit:

	return ret;

}



static int T4_init(struct hid_device *hdev, struct alps_dev *pri_data)

{

	int ret;

	u8 tmp, sen_line_num_x, sen_line_num_y;



	ret = t4_read_write_register(hdev, T4_PRM_ID_CONFIG_3, &tmp, 0, true);

	if (ret < 0) {

		dev_err(&hdev->dev, "failed T4_PRM_ID_CONFIG_3 (%d)\n", ret);

		goto exit;

	}

	sen_line_num_x = 16 + ((tmp & 0x0F)  | (tmp & 0x08 ? 0xF0 : 0));

	sen_line_num_y = 12 + (((tmp & 0xF0) >> 4)  | (tmp & 0x80 ? 0xF0 : 0));



	pri_data->x_max = sen_line_num_x * T4_COUNT_PER_ELECTRODE;

	pri_data->x_min = T4_COUNT_PER_ELECTRODE;

	pri_data->y_max = sen_line_num_y * T4_COUNT_PER_ELECTRODE;

	pri_data->y_min = T4_COUNT_PER_ELECTRODE;

	pri_data->x_active_len_mm = pri_data->y_active_len_mm = 0;

	pri_data->btn_cnt = 1;



	ret = t4_read_write_register(hdev, PRM_SYS_CONFIG_1, &tmp, 0, true);

	if (ret < 0) {

		dev_err(&hdev->dev, "failed PRM_SYS_CONFIG_1 (%d)\n", ret);

		goto exit;

	}

	tmp |= 0x02;

	ret = t4_read_write_register(hdev, PRM_SYS_CONFIG_1, NULL, tmp, false);

	if (ret < 0) {

		dev_err(&hdev->dev, "failed PRM_SYS_CONFIG_1 (%d)\n", ret);

		goto exit;

	}



	ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_1,

					NULL, T4_I2C_ABS, false);

	if (ret < 0) {

		dev_err(&hdev->dev, "failed T4_PRM_FEED_CONFIG_1 (%d)\n", ret);

		goto exit;

	}



	ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_4, NULL,

				T4_FEEDCFG4_ADVANCED_ABS_ENABLE, false);

	if (ret < 0) {

		dev_err(&hdev->dev, "failed T4_PRM_FEED_CONFIG_4 (%d)\n", ret);

		goto exit;

	}

	pri_data->max_fingers = 5;

	pri_data->has_sp = 0;

exit:

	return ret;

}



static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)

{

	struct alps_dev *data = hid_get_drvdata(hdev);

	struct input_dev *input = hi->input, *input2;

	int ret;

	int res_x, res_y, i;



	data->input = input;



	hid_dbg(hdev, "Opening low level driver\n");

	ret = hid_hw_open(hdev);

	if (ret)

		return ret;





	devInfo.x_active_len_mm =

	/* Allow incoming hid reports */

		(devInfo.pitch_x * (devInfo.sen_line_num_x - 1)) / 10;

	hid_device_io_start(hdev);

	devInfo.y_active_len_mm =

	switch (data->dev_type) {

		(devInfo.pitch_y * (devInfo.sen_line_num_y - 1)) / 10;

	case T4:

		ret = T4_init(hdev, data);

		break;

	case U1:

		ret = u1_init(hdev, data);

		break;

	default:

		break;

	}





	devInfo.x_max =

	if (ret)

		(devInfo.resolution << 2) * (devInfo.sen_line_num_x - 1);

		goto exit;

	devInfo.y_max =

		(devInfo.resolution << 2) * (devInfo.sen_line_num_y - 1);





	__set_bit(EV_ABS, input->evbit);

	__set_bit(EV_ABS, input->evbit);

	input_set_abs_params(input, ABS_MT_POSITION_X, 1, devInfo.x_max, 0, 0);

	input_set_abs_params(input, ABS_MT_POSITION_X,

	input_set_abs_params(input, ABS_MT_POSITION_Y, 1, devInfo.y_max, 0, 0);

						data->x_min, data->x_max, 0, 0);

	input_set_abs_params(input, ABS_MT_POSITION_Y,

						data->y_min, data->y_max, 0, 0);





	if (devInfo.x_active_len_mm && devInfo.y_active_len_mm) {

	if (data->x_active_len_mm && data->y_active_len_mm) {

		res_x = (devInfo.x_max - 1) / devInfo.x_active_len_mm;

		res_x = (data->x_max - 1) / data->x_active_len_mm;

		res_y = (devInfo.y_max - 1) / devInfo.y_active_len_mm;

		res_y = (data->y_max - 1) / data->y_active_len_mm;





		input_abs_set_res(input, ABS_MT_POSITION_X, res_x);

		input_abs_set_res(input, ABS_MT_POSITION_X, res_x);

		input_abs_set_res(input, ABS_MT_POSITION_Y, res_y);

		input_abs_set_res(input, ABS_MT_POSITION_Y, res_y);
@@ -364,49 +686,25 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) 




	input_set_abs_params(input, ABS_MT_PRESSURE, 0, 64, 0, 0);

	input_set_abs_params(input, ABS_MT_PRESSURE, 0, 64, 0, 0);





	input_mt_init_slots(input, MAX_TOUCHES, INPUT_MT_POINTER);

	input_mt_init_slots(input, data->max_fingers, INPUT_MT_POINTER);





	__set_bit(EV_KEY, input->evbit);

	__set_bit(EV_KEY, input->evbit);

	if ((devInfo.btn_info & 0x0F) == (devInfo.btn_info & 0xF0) >> 4) {



		devInfo.btn_cnt = (devInfo.btn_info & 0x0F);

	if (data->btn_cnt == 1)

	} else {

		/* Button pad */

		devInfo.btn_cnt = 1;

		__set_bit(INPUT_PROP_BUTTONPAD, input->propbit);

		__set_bit(INPUT_PROP_BUTTONPAD, input->propbit);

	}





	for (i = 0; i < devInfo.btn_cnt; i++)

	for (i = 0; i < data->btn_cnt; i++)

		__set_bit(BTN_LEFT + i, input->keybit);

		__set_bit(BTN_LEFT + i, input->keybit);







	/* Stick device initialization */

	/* Stick device initialization */

	if (devInfo.dev_type & U1_DEVTYPE_SP_SUPPORT) {

	if (data->has_sp) {



		input2 = input_allocate_device();

		input2 = input_allocate_device();

		if (!input2) {

		if (!input2) {

			ret = -ENOMEM;

			goto exit;

		}



		data->input2 = input2;



		devInfo.dev_ctrl |= U1_SP_ABS_MODE;

		ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,

			NULL, devInfo.dev_ctrl, false);

		if (ret < 0) {

			dev_err(&hdev->dev, "failed SP mode (%d)\n", ret);

			input_free_device(input2);

			goto exit;

		}



		ret = u1_read_write_register(hdev, ADDRESS_U1_SP_BTN,

			&devInfo.sp_btn_info, 0, true);

		if (ret < 0) {

			dev_err(&hdev->dev, "failed U1_SP_BTN (%d)\n", ret);

			input_free_device(input2);

			input_free_device(input2);

			goto exit;

			goto exit;

		}

		}





		data->input2 = input2;

		input2->phys = input->phys;

		input2->phys = input->phys;

		input2->name = "DualPoint Stick";

		input2->name = "DualPoint Stick";

		input2->id.bustype = BUS_I2C;

		input2->id.bustype = BUS_I2C;
@@ -416,8 +714,8 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) 
		input2->dev.parent = input->dev.parent;

		input2->dev.parent = input->dev.parent;





		__set_bit(EV_KEY, input2->evbit);

		__set_bit(EV_KEY, input2->evbit);

		devInfo.sp_btn_cnt = (devInfo.sp_btn_info & 0x0F);

		data->sp_btn_cnt = (data->sp_btn_info & 0x0F);

		for (i = 0; i < devInfo.sp_btn_cnt; i++)

		for (i = 0; i < data->sp_btn_cnt; i++)

			__set_bit(BTN_LEFT + i, input2->keybit);

			__set_bit(BTN_LEFT + i, input2->keybit);





		__set_bit(EV_REL, input2->evbit);

		__set_bit(EV_REL, input2->evbit);
@@ -426,8 +724,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) 
		__set_bit(INPUT_PROP_POINTER, input2->propbit);

		__set_bit(INPUT_PROP_POINTER, input2->propbit);

		__set_bit(INPUT_PROP_POINTING_STICK, input2->propbit);

		__set_bit(INPUT_PROP_POINTING_STICK, input2->propbit);





		ret = input_register_device(data->input2);

		if (input_register_device(data->input2)) {

		if (ret) {

			input_free_device(input2);

			input_free_device(input2);

			goto exit;

			goto exit;

		}

		}
@@ -448,10 +745,9 @@ static int alps_input_mapping(struct hid_device *hdev, 




static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)

static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)

{

{

	struct u1_dev *data = NULL;

	struct alps_dev *data = NULL;

	int ret;

	int ret;



	data = devm_kzalloc(&hdev->dev, sizeof(struct alps_dev), GFP_KERNEL);

	data = devm_kzalloc(&hdev->dev, sizeof(struct u1_dev), GFP_KERNEL);

	if (!data)

	if (!data)

		return -ENOMEM;

		return -ENOMEM;
@@ -466,6 +762,18 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		return ret;

		return ret;

	}

	}





	switch (hdev->product) {

	case HID_DEVICE_ID_ALPS_T4_BTNLESS:

		data->dev_type = T4;

		break;

	case HID_DEVICE_ID_ALPS_U1_DUAL:

	case HID_DEVICE_ID_ALPS_U1:

		data->dev_type = U1;

		break;

	default:

		data->dev_type = UNKNOWN;

	}



	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret) {

	if (ret) {

		hid_err(hdev, "hw start failed\n");

		hid_err(hdev, "hw start failed\n");
@@ -483,6 +791,10 @@ static void alps_remove(struct hid_device *hdev) 
static const struct hid_device_id alps_id[] = {

static const struct hid_device_id alps_id[] = {

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,

		USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },

		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) },

	{ }

	{ }

};

};

MODULE_DEVICE_TABLE(hid, alps_id);

MODULE_DEVICE_TABLE(hid, alps_id);

drivers/hid/hid-asus.c

+30 −1
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); 
#define QUIRK_USE_KBD_BACKLIGHT		BIT(5)

#define QUIRK_USE_KBD_BACKLIGHT		BIT(5)

#define QUIRK_T100_KEYBOARD		BIT(6)

#define QUIRK_T100_KEYBOARD		BIT(6)

#define QUIRK_T100CHI			BIT(7)

#define QUIRK_T100CHI			BIT(7)

#define QUIRK_G752_KEYBOARD		BIT(8)





#define I2C_KEYBOARD_QUIRKS			(QUIRK_FIX_NOTEBOOK_REPORT | \

#define I2C_KEYBOARD_QUIRKS			(QUIRK_FIX_NOTEBOOK_REPORT | \

						 QUIRK_NO_INIT_REPORTS | \

						 QUIRK_NO_INIT_REPORTS | \
@@ -670,6 +671,11 @@ static void asus_remove(struct hid_device *hdev) 
	hid_hw_stop(hdev);

	hid_hw_stop(hdev);

}

}





static const __u8 asus_g752_fixed_rdesc[] = {

        0x19, 0x00,			/*   Usage Minimum (0x00)       */

        0x2A, 0xFF, 0x00,		/*   Usage Maximum (0xFF)       */

};



static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,

static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

		unsigned int *rsize)

{

{
@@ -708,6 +714,27 @@ static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
		rdesc[391] = 0xff;

		rdesc[391] = 0xff;

		rdesc[402] = 0x00;

		rdesc[402] = 0x00;

	}

	}

	if (drvdata->quirks & QUIRK_G752_KEYBOARD &&

		 *rsize == 75 && rdesc[61] == 0x15 && rdesc[62] == 0x00) {

		/* report is missing usage mninum and maximum */

		__u8 *new_rdesc;

		size_t new_size = *rsize + sizeof(asus_g752_fixed_rdesc);



		new_rdesc = devm_kzalloc(&hdev->dev, new_size, GFP_KERNEL);

		if (new_rdesc == NULL)

			return rdesc;



		hid_info(hdev, "Fixing up Asus G752 keyb report descriptor\n");

		/* copy the valid part */

		memcpy(new_rdesc, rdesc, 61);

		/* insert missing part */

		memcpy(new_rdesc + 61, asus_g752_fixed_rdesc, sizeof(asus_g752_fixed_rdesc));

		/* copy remaining data */

		memcpy(new_rdesc + 61 + sizeof(asus_g752_fixed_rdesc), rdesc + 61, *rsize - 61);



		*rsize = new_size;

		rdesc = new_rdesc;

	}





	return rdesc;

	return rdesc;

}

}
@@ -718,9 +745,11 @@ static const struct hid_device_id asus_devices[] = { 
	{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD), I2C_TOUCHPAD_QUIRKS },

		USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD), I2C_TOUCHPAD_QUIRKS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },

		USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1), QUIRK_USE_KBD_BACKLIGHT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2), QUIRK_USE_KBD_BACKLIGHT },

		USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2), QUIRK_USE_KBD_BACKLIGHT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD),

		USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD),

	  QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },

	  QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },

drivers/hid/hid-core.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -1662,7 +1662,7 @@ static struct bin_attribute dev_bin_attr_report_desc = { 
	.size = HID_MAX_DESCRIPTOR_SIZE,

	.size = HID_MAX_DESCRIPTOR_SIZE,

};

};





static struct device_attribute dev_attr_country = {

static const struct device_attribute dev_attr_country = {

	.attr = { .name = "country", .mode = 0444 },

	.attr = { .name = "country", .mode = 0444 },

	.show = show_country,

	.show = show_country,

};

};
@@ -1889,6 +1889,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
#endif

#endif

#if IS_ENABLED(CONFIG_HID_ALPS)

#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_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

#endif

#if IS_ENABLED(CONFIG_HID_APPLE)

#if IS_ENABLED(CONFIG_HID_APPLE)

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
@@ -1979,6 +1982,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD) },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
@@ -2329,6 +2333,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb605) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
@@ -3121,4 +3126,3 @@ MODULE_AUTHOR("Andreas Gal"); 
MODULE_AUTHOR("Vojtech Pavlik");

MODULE_AUTHOR("Vojtech Pavlik");

MODULE_AUTHOR("Jiri Kosina");

MODULE_AUTHOR("Jiri Kosina");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");

drivers/hid/hid-cp2112.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
 * Data Sheet:

 * Data Sheet:

 *   http://www.silabs.com/Support%20Documents/TechnicalDocs/CP2112.pdf

 *   http://www.silabs.com/Support%20Documents/TechnicalDocs/CP2112.pdf

 * Programming Interface Specification:

 * Programming Interface Specification:

 *   http://www.silabs.com/Support%20Documents/TechnicalDocs/AN495.pdf

 *   https://www.silabs.com/documents/public/application-notes/an495-cp2112-interface-specification.pdf

 */

 */





#include <linux/gpio.h>

#include <linux/gpio.h>
@@ -196,6 +196,8 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) 
				 HID_REQ_GET_REPORT);

				 HID_REQ_GET_REPORT);

	if (ret != CP2112_GPIO_CONFIG_LENGTH) {

	if (ret != CP2112_GPIO_CONFIG_LENGTH) {

		hid_err(hdev, "error requesting GPIO config: %d\n", ret);

		hid_err(hdev, "error requesting GPIO config: %d\n", ret);

		if (ret >= 0)

			ret = -EIO;

		goto exit;

		goto exit;

	}

	}
@@ -205,8 +207,10 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) 
	ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,

	ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,

				 CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,

				 CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,

				 HID_REQ_SET_REPORT);

				 HID_REQ_SET_REPORT);

	if (ret < 0) {

	if (ret != CP2112_GPIO_CONFIG_LENGTH) {

		hid_err(hdev, "error setting GPIO config: %d\n", ret);

		hid_err(hdev, "error setting GPIO config: %d\n", ret);

		if (ret >= 0)

			ret = -EIO;

		goto exit;

		goto exit;

	}

	}
@@ -214,7 +218,7 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) 




exit:

exit:

	mutex_unlock(&dev->lock);

	mutex_unlock(&dev->lock);

	return ret < 0 ? ret : -EIO;

	return ret;

}

}





static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

CRA Git | Maintained and supported by SUSTech CRA and CCSE