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

Commit af79ce47 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 subsystem updates from Dmitry Torokhov:

 - updated support for Synaptics RMI4 devices, including support for
   SMBus controllers, firmware update support, sensor tuning, and PS/2
   guest support

 - ALPS driver now supports tracksticks on SS5 controllers

 - i8042 now uses chassis info to skip selftest on Asus laptops as list
   of individual models became too unwieldy

 - miscellaneous fixes to other drivers

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (67 commits)
  Input: imx6ul_tsc - generalize the averaging property
  Input: drv260x - use generic device properties
  Input: drv260x - use temporary for &client->dev
  Input: drv260x - fix input device's parent assignment
  Input: synaptics-rmi4 - add support for F34 V7 bootloader
  Input: drv260x - fix initializing overdrive voltage
  Input: ALPS - fix protcol -> protocol
  Input: i8042 - comment #else/#endif of CONFIG_PNP
  Input: lpc32xx-keys - fix invalid error handling of a requested irq
  Input: synaptics-rmi4 - fix debug for sensor clip
  Input: synaptics-rmi4 - store the attn data in the driver
  Input: synaptics-rmi4 - allow to add attention data
  Input: synaptics-rmi4 - f03 - grab data passed by transport device
  Input: synaptics-rmi4 - add support for F03
  Input: imx6ul_tsc - convert int to u32
  Input: imx6ul_tsc - add mask when set REG_ADC_CFG
  Input: synaptics-rmi4 - have only one struct platform data
  Input: synaptics-rmi4 - remove EXPORT_SYMBOL_GPL for internal functions
  Input: synaptics-rmi4 - remove mutex calls while updating the firmware
  Input: drv2667 - fix misuse of regmap_update_bits
  ...
parents c07dee73 f26e8817

Documentation/devicetree/bindings/input/da9062-onkey.txt

+30 −15
Original line number Diff line number Diff line 
* Dialog DA9062/63 OnKey Module

* Dialog DA9061/62/63 OnKey Module



This module is part of the DA9062/DA9063. For more details about entire

chips see Documentation/devicetree/bindings/mfd/da9062.txt and

Documentation/devicetree/bindings/mfd/da9063.txt

This module is part of the DA9061/DA9062/DA9063. For more details about entire

DA9062 and DA9061 chips see Documentation/devicetree/bindings/mfd/da9062.txt

For DA9063 see Documentation/devicetree/bindings/mfd/da9063.txt



This module provides KEY_POWER, KEY_SLEEP and events.

This module provides the KEY_POWER event.



Required properties:



- compatible: should be one of:

	dlg,da9062-onkey

	dlg,da9063-onkey

- compatible: should be one of the following valid compatible string lines:

	"dlg,da9061-onkey", "dlg,da9062-onkey"

	"dlg,da9062-onkey"

	"dlg,da9063-onkey"



Optional properties:



- dlg,disable-key-power : Disable power-down using a long key-press. If this

    entry exists the OnKey driver will remove support for the KEY_POWER key

    press. If this entry does not exist then by default the key-press

    triggered power down is enabled and the OnKey will support both KEY_POWER

    and KEY_SLEEP.

    press when triggered using a long press of the OnKey.



Example:



	pmic0: da9062@58 {

Example: DA9063



	pmic0: da9063@58 {

		onkey {

			compatible = "dlg,da9063-onkey";

			dlg,disable-key-power;

		};

	};



Example: DA9062



	pmic0: da9062@58 {

		onkey {

			compatible = "dlg,da9062-onkey";

			dlg,disable-key-power;

		};

	};



Example: DA9061 using a fall-back compatible for the DA9062 onkey driver



	pmic0: da9061@58 {

		onkey {

			compatible = "dlg,da9061-onkey", "dlg,da9062-onkey";

			dlg,disable-key-power;

		};

	};

Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ Optional properties: 
  This value depends on the touch screen.

- pre-charge-time: the touch screen need some time to precharge.

  This value depends on the touch screen.

- touchscreen-average-samples: Number of data samples which are averaged for

  each read. Valid values are 1, 4, 8, 16 and 32.



Example:

	tsc: tsc@02040000 {
@@ -32,5 +34,6 @@ Example: 
		xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;

		measure-delay-time = <0xfff>;

		pre-charge-time = <0xffff>;

		touchscreen-average-samples = <32>;

		status = "okay";

	};

Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ Optional properties: 
- touchscreen-inverted-y  : See touchscreen.txt

- touchscreen-swapped-x-y : See touchscreen.txt

- silead,max-fingers	  : maximum number of fingers the touchscreen can detect

- vddio-supply		  : regulator phandle for controller VDDIO

- avdd-supply		  : regulator phandle for controller AVDD



Example:

Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ Optional properties for Touchscreens: 
 - touchscreen-fuzz-pressure	: pressure noise value of the absolute input

				  device (arbitrary range dependent on the

				  controller)

 - touchscreen-average-samples : Number of data samples which are averaged

				  for each read (valid values dependent on the

				  controller)

 - touchscreen-inverted-x	: X axis is inverted (boolean)

 - touchscreen-inverted-y	: Y axis is inverted (boolean)

 - touchscreen-swapped-x-y	: X and Y axis are swapped (boolean)

drivers/input/joystick/xpad.c

+4 −3
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static const struct xpad_device { 
	{ 0x045e, 0x02d1, "Microsoft X-Box One pad", 0, XTYPE_XBOXONE },

	{ 0x045e, 0x02dd, "Microsoft X-Box One pad (Firmware 2015)", 0, XTYPE_XBOXONE },

	{ 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", 0, XTYPE_XBOXONE },

	{ 0x045e, 0x02ea, "Microsoft X-Box One S pad", 0, XTYPE_XBOXONE },

	{ 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },

	{ 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },

	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
@@ -1044,9 +1045,9 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect 
		packet->data[7] = 0x00;

		packet->data[8] = strong / 512;	/* left actuator */

		packet->data[9] = weak / 512;	/* right actuator */

		packet->data[10] = 0xFF;

		packet->data[11] = 0x00;

		packet->data[12] = 0x00;

		packet->data[10] = 0xFF; /* on period */

		packet->data[11] = 0x00; /* off period */

		packet->data[12] = 0xFF; /* repeat count */

		packet->len = 13;

		packet->pending = true;

		break;