Commit adac0753 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input updates from Dmitry Torokhov:
 "Mostly new IDs for Elan/Synaptics touchpads, plus a few small fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: omap-keypad - fix keyboard debounce configuration
  Input: xpad - quirk all PDP Xbox One gamepads
  Input: synaptics - enable SMBus for HP 15-ay000
  Input: synaptics - add PNP ID for ThinkPad P50 to SMBus
  Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15ARR
  Input: elan_i2c - add support for ELAN0621 touchpad
  Input: hyper-v - fix wakeup from suspend-to-idle
  Input: atkbd - clean up indentation issue
  Input: st1232 - convert to SPDX identifiers
  Input: migor_ts - convert to SPDX identifiers
  Input: dt-bindings - fix a typo in file input-reset.txt
  Input: cros_ec_keyb - fix button/switch capability reports
  Input: elan_i2c - add ELAN0620 to the ACPI table
  Input: matrix_keypad - check for errors from of_get_named_gpio()
parents 0072a0c1 6c3516fe

Documentation/devicetree/bindings/input/input-reset.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ The /chosen node should contain a 'linux,sysrq-reset-seq' child node to define 
a set of keys.



Required property:

sysrq-reset-seq: array of Linux keycodes, one keycode per cell.

keyset: array of Linux keycodes, one keycode per cell.



Optional property:

timeout-ms: duration keys must be pressed together in milliseconds before

drivers/hid/hid-hyperv.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static void mousevsc_on_receive(struct hv_device *device, 
		hid_input_report(input_dev->hid_device, HID_INPUT_REPORT,

				 input_dev->input_buf, len, 1);



		pm_wakeup_event(&input_dev->device->device, 0);

		pm_wakeup_hard_event(&input_dev->device->device);



		break;

	default:

drivers/input/joystick/xpad.c

+6 −10
Original line number Diff line number Diff line
@@ -480,18 +480,18 @@ static const u8 xboxone_hori_init[] = { 
};



/*

 * This packet is required for some of the PDP pads to start

 * This packet is required for most (all?) of the PDP pads to start

 * sending input reports. These pads include: (0x0e6f:0x02ab),

 * (0x0e6f:0x02a4).

 * (0x0e6f:0x02a4), (0x0e6f:0x02a6).

 */

static const u8 xboxone_pdp_init1[] = {

	0x0a, 0x20, 0x00, 0x03, 0x00, 0x01, 0x14

};



/*

 * This packet is required for some of the PDP pads to start

 * This packet is required for most (all?) of the PDP pads to start

 * sending input reports. These pads include: (0x0e6f:0x02ab),

 * (0x0e6f:0x02a4).

 * (0x0e6f:0x02a4), (0x0e6f:0x02a6).

 */

static const u8 xboxone_pdp_init2[] = {

	0x06, 0x20, 0x00, 0x02, 0x01, 0x00
@@ -527,12 +527,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = { 
	XBOXONE_INIT_PKT(0x0e6f, 0x0165, xboxone_hori_init),

	XBOXONE_INIT_PKT(0x0f0d, 0x0067, xboxone_hori_init),

	XBOXONE_INIT_PKT(0x0000, 0x0000, xboxone_fw2015_init),

	XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init1),

	XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2),

	XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1),

	XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2),

	XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init1),

	XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init2),

	XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init1),

	XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init2),

	XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),

	XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),

	XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),

drivers/input/keyboard/cros_ec_keyb.c

+2 −1
Original line number Diff line number Diff line
@@ -493,7 +493,8 @@ static int cros_ec_keyb_register_bs(struct cros_ec_keyb *ckdev) 
	for (i = 0; i < ARRAY_SIZE(cros_ec_keyb_bs); i++) {

		const struct cros_ec_bs_map *map = &cros_ec_keyb_bs[i];



		if (buttons & BIT(map->bit))

		if ((map->ev_type == EV_KEY && (buttons & BIT(map->bit))) ||

		    (map->ev_type == EV_SW && (switches & BIT(map->bit))))

			input_set_capability(idev, map->ev_type, map->code);

	}

drivers/input/keyboard/matrix_keypad.c

+14 −9
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ matrix_keypad_parse_dt(struct device *dev) 
	struct matrix_keypad_platform_data *pdata;

	struct device_node *np = dev->of_node;

	unsigned int *gpios;

	int i, nrow, ncol;

	int ret, i, nrow, ncol;



	if (!np) {

		dev_err(dev, "device lacks DT data\n");
@@ -452,12 +452,19 @@ matrix_keypad_parse_dt(struct device *dev) 
		return ERR_PTR(-ENOMEM);

	}



	for (i = 0; i < pdata->num_row_gpios; i++)

		gpios[i] = of_get_named_gpio(np, "row-gpios", i);

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

		ret = of_get_named_gpio(np, "row-gpios", i);

		if (ret < 0)

			return ERR_PTR(ret);

		gpios[i] = ret;

	}



	for (i = 0; i < pdata->num_col_gpios; i++)

		gpios[pdata->num_row_gpios + i] =

			of_get_named_gpio(np, "col-gpios", i);

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

		ret = of_get_named_gpio(np, "col-gpios", i);

		if (ret < 0)

			return ERR_PTR(ret);

		gpios[nrow + i] = ret;

	}



	pdata->row_gpios = gpios;

	pdata->col_gpios = &gpios[pdata->num_row_gpios];
@@ -484,10 +491,8 @@ static int matrix_keypad_probe(struct platform_device *pdev) 
	pdata = dev_get_platdata(&pdev->dev);

	if (!pdata) {

		pdata = matrix_keypad_parse_dt(&pdev->dev);

		if (IS_ERR(pdata)) {

			dev_err(&pdev->dev, "no platform data defined\n");

		if (IS_ERR(pdata))

			return PTR_ERR(pdata);

		}

	} else if (!pdata->keymap_data) {

		dev_err(&pdev->dev, "no keymap data defined\n");

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE