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

Commit 60cfc98b 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 layer updates from Dmitry Torokhov:

 - a new ACPI ID for Elan touchpad found in yet another Ideapad model

 - Synaptics RMI4 will allow binding to controllers reporting SMB
   version 3 (note that we are not adding any new ACPI IDs to the
   Synaptics PS/2 drover so unless user explicitly enables intertouch
   support there is no user-visible change)

 - a fixup to TSC 2004/5 touchscreen driver to mark input devices as
   "direct" to help userspace identify the type of device they are
   dealing with

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3
  Input: tsc200x-core - set INPUT_PROP_DIRECT
  Input: elan_i2c - add ELAN060C to the ACPI table
parents 5cf2360b 26dd633e

drivers/input/mouse/elan_i2c_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1258,6 +1258,7 @@ static const struct acpi_device_id elan_acpi_id[] = { 
	{ "ELAN0605", 0 },

	{ "ELAN0609", 0 },

	{ "ELAN060B", 0 },

	{ "ELAN060C", 0 },

	{ "ELAN0611", 0 },

	{ "ELAN1000", 0 },

	{ }

drivers/input/rmi4/rmi_smbus.c

+2 −2
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static int rmi_smb_probe(struct i2c_client *client, 
	rmi_smb->xport.dev = &client->dev;

	rmi_smb->xport.pdata = *pdata;

	rmi_smb->xport.pdata.irq = client->irq;

	rmi_smb->xport.proto_name = "smb2";

	rmi_smb->xport.proto_name = "smb";

	rmi_smb->xport.ops = &rmi_smb_ops;



	smbus_version = rmi_smb_get_version(rmi_smb);
@@ -322,7 +322,7 @@ static int rmi_smb_probe(struct i2c_client *client, 
	rmi_dbg(RMI_DEBUG_XPORT, &client->dev, "Smbus version is %d",

		smbus_version);



	if (smbus_version != 2) {

	if (smbus_version != 2 && smbus_version != 3) {

		dev_err(&client->dev, "Unrecognized SMB version %d\n",

				smbus_version);

		return -ENODEV;

drivers/input/touchscreen/tsc200x-core.c

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id, 


	input_set_drvdata(input_dev, ts);



	__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);

	input_set_capability(input_dev, EV_KEY, BTN_TOUCH);



	input_set_abs_params(input_dev, ABS_X,