Commit bbdb5c22 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare second round of input updates for 4.3 merge window.
parents e60e063c 5e0baca8

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

+28 −6
Original line number Diff line number Diff line 
* Texas Instruments tsc2005 touchscreen controller

* Texas Instruments tsc2004 and tsc2005 touchscreen controllers



Required properties:

 - compatible		      : "ti,tsc2005"

 - reg			      : SPI device address

 - spi-max-frequency	      : Maximal SPI speed

 - compatible		      : "ti,tsc2004" or "ti,tsc2005"

 - reg			      : Device address

 - interrupts		      : IRQ specifier

 - reset-gpios		      : GPIO specifier

 - vio-supply                 : Regulator specifier

 - spi-max-frequency	      : Maximum SPI clocking speed of the device

			        (for tsc2005)



Optional properties:

 - vio-supply		      : Regulator specifier

 - reset-gpios		      : GPIO specifier for the controller reset line

 - ti,x-plate-ohms	      : integer, resistance of the touchscreen's X plates

				in ohm (defaults to 280)

 - ti,esd-recovery-timeout-ms : integer, if the touchscreen does not respond after
@@ -18,6 +19,27 @@ Optional properties: 


Example:



&i2c3 {

	tsc2004@48 {

		compatible = "ti,tsc2004";

		reg = <0x48>;

		vio-supply = <&vio>;



		reset-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;

		interrupts-extended = <&gpio1 27 IRQ_TYPE_EDGE_RISING>;



		touchscreen-fuzz-x = <4>;

		touchscreen-fuzz-y = <7>;

		touchscreen-fuzz-pressure = <2>;

		touchscreen-size-x = <4096>;

		touchscreen-size-y = <4096>;

		touchscreen-max-pressure = <2048>;



		ti,x-plate-ohms = <280>;

		ti,esd-recovery-timeout-ms = <8000>;

	};

}



&mcspi1 {

	tsc2005@0 {

		compatible = "ti,tsc2005";

drivers/input/mouse/elantech.c

+7 −0
Original line number Diff line number Diff line
@@ -1520,6 +1520,13 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E544"),

		},

	},

	{

		/* Fujitsu LIFEBOOK U745 does not work with crc_enabled == 0 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),

			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U745"),

		},

	},

#endif

	{ }

};

drivers/input/serio/parkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int parkbd_getport(struct parport *pp) 
	return 0;

}



static struct serio * __init parkbd_allocate_serio(void)

static struct serio *parkbd_allocate_serio(void)

{

	struct serio *serio;

drivers/input/touchscreen/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -939,10 +939,27 @@ config TOUCHSCREEN_TSC_SERIO 
	  To compile this driver as a module, choose M here: the

	  module will be called tsc40.



config TOUCHSCREEN_TSC200X_CORE

	tristate



config TOUCHSCREEN_TSC2004

	tristate "TSC2004 based touchscreens"

	depends on I2C

	select REGMAP_I2C

	select TOUCHSCREEN_TSC200X_CORE

	help

	  Say Y here if you have a TSC2004 based touchscreen.



	  If unsure, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called tsc2004.



config TOUCHSCREEN_TSC2005

	tristate "TSC2005 based touchscreens"

	depends on SPI_MASTER

	select REGMAP_SPI

	select TOUCHSCREEN_TSC200X_CORE

	help

	  Say Y here if you have a TSC2005 based touchscreen.

drivers/input/touchscreen/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o 
obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o

obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o

obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO)	+= tsc40.o

obj-$(CONFIG_TOUCHSCREEN_TSC200X_CORE)	+= tsc200x-core.o

obj-$(CONFIG_TOUCHSCREEN_TSC2004)	+= tsc2004.o

obj-$(CONFIG_TOUCHSCREEN_TSC2005)	+= tsc2005.o

obj-$(CONFIG_TOUCHSCREEN_TSC2007)	+= tsc2007.o

obj-$(CONFIG_TOUCHSCREEN_UCB1400)	+= ucb1400_ts.o