Commit 6d90b4f9 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:
 "Small driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data
  Input: adxl34x - make it enumerable in ACPI environment
  Input: ALPS - fix TrackStick Y axis handling for SS5 hardware
  Input: synaptics-rmi4 - fix F03 build error when serio is module
  Input: xpad - use correct product id for x360w controllers
  Input: synaptics_i2c - change msleep to usleep_range for small msecs
  Input: i8042 - add Pegatron touchpad to noloop table
  Input: joydev - remove unused linux/miscdevice.h include
parents 557ed56c 1c3415a0

drivers/input/joydev.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/mm.h>

#include <linux/miscdevice.h>

#include <linux/module.h>

#include <linux/poll.h>

#include <linux/init.h>

drivers/input/joystick/xpad.c

+6 −0
Original line number Diff line number Diff line
@@ -1377,6 +1377,12 @@ static int xpad_init_input(struct usb_xpad *xpad) 
	input_dev->name = xpad->name;

	input_dev->phys = xpad->phys;

	usb_to_input_id(xpad->udev, &input_dev->id);



	if (xpad->xtype == XTYPE_XBOX360W) {

		/* x360w controllers and the receiver have different ids */

		input_dev->id.product = 0x02a1;

	}



	input_dev->dev.parent = &xpad->intf->dev;



	input_set_drvdata(input_dev, xpad);

drivers/input/misc/adxl34x-i2c.c

+1 −3
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ static const struct i2c_device_id adxl34x_id[] = { 


MODULE_DEVICE_TABLE(i2c, adxl34x_id);



#ifdef CONFIG_OF

static const struct of_device_id adxl34x_of_id[] = {

	/*

	 * The ADXL346 is backward-compatible with the ADXL345. Differences are
@@ -153,13 +152,12 @@ static const struct of_device_id adxl34x_of_id[] = { 
};



MODULE_DEVICE_TABLE(of, adxl34x_of_id);

#endif



static struct i2c_driver adxl34x_driver = {

	.driver = {

		.name = "adxl34x",

		.pm = &adxl34x_i2c_pm,

		.of_match_table = of_match_ptr(adxl34x_of_id),

		.of_match_table = adxl34x_of_id,

	},

	.probe    = adxl34x_i2c_probe,

	.remove   = adxl34x_i2c_remove,

drivers/input/mouse/alps.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ enum SS4_PACKET_ID { 
				 (_b[1] & 0x7F)		\

				)



#define SS4_TS_Y_V2(_b)		(s8)(				\

#define SS4_TS_Y_V2(_b)		-(s8)(				\

				 ((_b[3] & 0x01) << 7) |	\

				 (_b[2] & 0x7F)		\

				)

drivers/input/mouse/synaptics_i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 * after soft reset, we should wait for 1 ms

 * before the device becomes operational

 */

#define SOFT_RESET_DELAY_MS	3

#define SOFT_RESET_DELAY_US	3000

/* and after hard reset, we should wait for max 500ms */

#define HARD_RESET_DELAY_MS	500
@@ -311,7 +311,7 @@ static int synaptics_i2c_reset_config(struct i2c_client *client) 
	if (ret) {

		dev_err(&client->dev, "Unable to reset device\n");

	} else {

		msleep(SOFT_RESET_DELAY_MS);

		usleep_range(SOFT_RESET_DELAY_US, SOFT_RESET_DELAY_US + 100);

		ret = synaptics_i2c_config(client);

		if (ret)

			dev_err(&client->dev, "Unable to config device\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE