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

Commit 2158091d 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:

 - a new driver to ChipOne icn8505 based touchscreens

 - on certain systems with Elan touch controllers they will be switched
   away form PS/2 emulation and over to native SMbus mode

 - assorted driver fixups and improvements

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (24 commits)
  Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID
  Input: goodix - add new ACPI id for GPD Win 2 touch screen
  Input: xpad - add GPD Win 2 Controller USB IDs
  Input: ti_am335x_tsc - prevent system suspend when TSC is in use
  Input: ti_am335x_tsc - ack pending IRQs at probe and before suspend
  Input: cros_ec_keyb - mark cros_ec_keyb driver as wake enabled device.
  Input: mk712 - update documentation web link
  Input: atmel_mxt_ts - fix reset-gpio for level based irqs
  Input: atmel_mxt_ts - require device properties present when probing
  Input: psmouse-smbus - allow to control psmouse_deactivate
  Input: elantech - detect new ICs and setup Host Notify for them
  Input: elantech - add support for SMBus devices
  Input: elantech - query the resolution in query_info
  Input: elantech - split device info into a separate structure
  Input: elan_i2c - add trackstick report
  Input: usbtouchscreen - add sysfs attribute for 3M MTouch firmware rev
  Input: ati_remote2 - fix typo 'can by' to 'can be'
  Input: replace hard coded string with __func__ in pr_err()
  Input: add support for ChipOne icn8505 based touchscreens
  Input: gamecon - avoid using __set_bit() for capabilities
  ...
parents 3e1a29b3 e6e7e9cd

Documentation/devicetree/bindings/input/elan_i2c.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Optional properties: 
- pinctrl-0: a phandle pointing to the pin settings for the device (see

  pinctrl binding [1]).

- vcc-supply: a phandle for the regulator supplying 3.3V power.

- elan,trackpoint: touchpad can support a trackpoint (boolean)



[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3431,6 +3431,12 @@ S: Maintained 
F:	Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt

F:	drivers/input/touchscreen/chipone_icn8318.c



CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER

M:	Hans de Goede <hdegoede@redhat.com>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/input/touchscreen/chipone_icn8505.c



CHROME HARDWARE PLATFORM SUPPORT

M:	Benson Leung <bleung@chromium.org>

M:	Olof Johansson <olof@lixom.net>

drivers/input/input.c

+1 −2
Original line number Diff line number Diff line
@@ -1943,8 +1943,7 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int 
		break;



	default:

		pr_err("input_set_capability: unknown type %u (code %u)\n",

		       type, code);

		pr_err("%s: unknown type %u (code %u)\n", __func__, type, code);

		dump_stack();

		return;

	}

drivers/input/joystick/as5011.c

+1 −3
Original line number Diff line number Diff line
@@ -269,9 +269,7 @@ static int as5011_probe(struct i2c_client *client, 
	input_dev->id.bustype = BUS_I2C;

	input_dev->dev.parent = &client->dev;



	__set_bit(EV_KEY, input_dev->evbit);

	__set_bit(EV_ABS, input_dev->evbit);

	__set_bit(BTN_JOYSTICK, input_dev->keybit);

	input_set_capability(input_dev, EV_KEY, BTN_JOYSTICK);



	input_set_abs_params(input_dev, ABS_X,

		AS5011_MIN_AXIS, AS5011_MAX_AXIS, AS5011_FUZZ, AS5011_FLAT);

drivers/input/joystick/gamecon.c

+15 −12
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ static int gc_setup_pad(struct gc *gc, int idx, int pad_type) 


	case GC_N64:

		for (i = 0; i < 10; i++)

			__set_bit(gc_n64_btn[i], input_dev->keybit);

			input_set_capability(input_dev, EV_KEY, gc_n64_btn[i]);



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

			input_set_abs_params(input_dev, ABS_X + i, -127, 126, 0, 2);
@@ -879,26 +879,27 @@ static int gc_setup_pad(struct gc *gc, int idx, int pad_type) 
		break;



	case GC_SNESMOUSE:

		__set_bit(BTN_LEFT, input_dev->keybit);

		__set_bit(BTN_RIGHT, input_dev->keybit);

		__set_bit(REL_X, input_dev->relbit);

		__set_bit(REL_Y, input_dev->relbit);

		input_set_capability(input_dev, EV_KEY, BTN_LEFT);

		input_set_capability(input_dev, EV_KEY, BTN_RIGHT);

		input_set_capability(input_dev, EV_REL, REL_X);

		input_set_capability(input_dev, EV_REL, REL_Y);

		break;



	case GC_SNES:

		for (i = 4; i < 8; i++)

			__set_bit(gc_snes_btn[i], input_dev->keybit);

			input_set_capability(input_dev, EV_KEY, gc_snes_btn[i]);

		/* fall through */

	case GC_NES:

		for (i = 0; i < 4; i++)

			__set_bit(gc_snes_btn[i], input_dev->keybit);

			input_set_capability(input_dev, EV_KEY, gc_snes_btn[i]);

		break;



	case GC_MULTI2:

		__set_bit(BTN_THUMB, input_dev->keybit);

		input_set_capability(input_dev, EV_KEY, BTN_THUMB);

		/* fall through */

	case GC_MULTI:

		__set_bit(BTN_TRIGGER, input_dev->keybit);

		input_set_capability(input_dev, EV_KEY, BTN_TRIGGER);

		/* fall through */

		break;



	case GC_PSX:
@@ -906,15 +907,17 @@ static int gc_setup_pad(struct gc *gc, int idx, int pad_type) 
			input_set_abs_params(input_dev,

					     gc_psx_abs[i], 4, 252, 0, 2);

		for (i = 0; i < 12; i++)

			__set_bit(gc_psx_btn[i], input_dev->keybit);

			input_set_capability(input_dev, EV_KEY, gc_psx_btn[i]);

		break;



		break;



	case GC_DDR:

		for (i = 0; i < 4; i++)

			__set_bit(gc_psx_ddr_btn[i], input_dev->keybit);

			input_set_capability(input_dev, EV_KEY,

					     gc_psx_ddr_btn[i]);

		for (i = 0; i < 12; i++)

			__set_bit(gc_psx_btn[i], input_dev->keybit);

			input_set_capability(input_dev, EV_KEY, gc_psx_btn[i]);



		break;

	}