Commit 7c2d1835 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 fixes from Dmitry Torokhov:
 "Nothing terribly interesting, just a few fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - sync supported devices with fork on GitHub
  Input: ariel-pwrbutton - remove unused variable ariel_pwrbutton_id_table
  Input: goodix - add support for Goodix GT9286 chip
  dt-bindings: input: touchscreen: goodix: Add binding for GT9286 IC
  dt-bindings: input: adc-keys: clarify description
  Input: ili210x - implement pressure reporting for ILI251x
  Input: i8042 - unbreak Pegatron C15B
  Input: st1232 - wait until device is ready before reading resolution
  Input: st1232 - do not read more bytes than needed
  Input: st1232 - fix off-by-one error in resolution handling
parents 964d069f 9bbd77d5

Documentation/devicetree/bindings/input/adc-keys.txt

+20 −2
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ Required properties: 
 - compatible: "adc-keys"

 - io-channels: Phandle to an ADC channel

 - io-channel-names = "buttons";

 - keyup-threshold-microvolt: Voltage at which all the keys are considered up.

 - keyup-threshold-microvolt: Voltage above or equal to which all the keys are

			      considered up.



Optional properties:

	- poll-interval: Poll interval time in milliseconds
@@ -17,7 +18,12 @@ Each button (key) is represented as a sub-node of "adc-keys": 
Required subnode-properties:

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.

	- press-threshold-microvolt: Voltage ADC input when this key is pressed.

	- press-threshold-microvolt: voltage above or equal to which this key is

				     considered pressed.



No two values of press-threshold-microvolt may be the same.

All values of press-threshold-microvolt must be less than

keyup-threshold-microvolt.



Example:
@@ -47,3 +53,15 @@ Example: 
			press-threshold-microvolt = <500000>;

		};

	};



+--------------------------------+------------------------+

| 2.000.000 <= value             | no key pressed         |

+--------------------------------+------------------------+

| 1.500.000 <= value < 2.000.000 | KEY_VOLUMEUP pressed   |

+--------------------------------+------------------------+

| 1.000.000 <= value < 1.500.000 | KEY_VOLUMEDOWN pressed |

+--------------------------------+------------------------+

|   500.000 <= value < 1.000.000 | KEY_ENTER pressed      |

+--------------------------------+------------------------+

|              value <   500.000 | no key pressed         |

+--------------------------------+------------------------+

Documentation/devicetree/bindings/input/touchscreen/goodix.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
      - goodix,gt927

      - goodix,gt9271

      - goodix,gt928

      - goodix,gt9286

      - goodix,gt967



  reg:

drivers/input/joystick/xpad.c

+16 −1
Original line number Diff line number Diff line
@@ -215,9 +215,17 @@ static const struct xpad_device { 
	{ 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360", 0, XTYPE_XBOX360 },

	{ 0x0e6f, 0x021f, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 },

	{ 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02a0, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02a1, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02a2, "PDP Wired Controller for Xbox One - Crimson Red", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02a7, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02a8, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02ad, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02b3, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x02b8, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 },

	{ 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE },

	{ 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
@@ -296,6 +304,9 @@ static const struct xpad_device { 
	{ 0x1bad, 0xfa01, "MadCatz GamePad", 0, XTYPE_XBOX360 },

	{ 0x1bad, 0xfd00, "Razer Onza TE", 0, XTYPE_XBOX360 },

	{ 0x1bad, 0xfd01, "Razer Onza", 0, XTYPE_XBOX360 },

	{ 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE },

	{ 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 },

	{ 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE },

	{ 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 },

	{ 0x24c6, 0x5303, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 },
@@ -429,8 +440,12 @@ static const struct usb_device_id xpad_table[] = { 
	XPAD_XBOX360_VENDOR(0x162e),		/* Joytech X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x1689),		/* Razer Onza */

	XPAD_XBOX360_VENDOR(0x1bad),		/* Harminix Rock Band Guitar and Drums */

	XPAD_XBOX360_VENDOR(0x20d6),		/* PowerA Controllers */

	XPAD_XBOXONE_VENDOR(0x20d6),		/* PowerA Controllers */

	XPAD_XBOX360_VENDOR(0x24c6),		/* PowerA Controllers */

	XPAD_XBOXONE_VENDOR(0x24c6),		/* PowerA Controllers */

	XPAD_XBOXONE_VENDOR(0x2e24),		/* Hyperkin Duke X-Box One pad */

	XPAD_XBOX360_VENDOR(0x2f24),		/* GameSir Controllers */

	{ }

};

drivers/input/misc/ariel-pwrbutton.c

+0 −6
Original line number Diff line number Diff line
@@ -149,12 +149,6 @@ static const struct of_device_id ariel_pwrbutton_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, ariel_pwrbutton_of_match);



static const struct spi_device_id ariel_pwrbutton_id_table[] = {

	{ "wyse-ariel-ec-input", 0 },

	{}

};

MODULE_DEVICE_TABLE(spi, ariel_pwrbutton_id_table);



static struct spi_driver ariel_pwrbutton_driver = {

	.driver = {

		.name = "dell-wyse-ariel-ec-input",

drivers/input/serio/i8042-x86ia64io.h

+2 −0
Original line number Diff line number Diff line
@@ -219,6 +219,8 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"),

			DMI_MATCH(DMI_PRODUCT_NAME, "C15B"),

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"),