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

Commit 74fb838c 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 fixes from Dmitry Torokhov:
 "Just a few driver fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: tsc40 - remove wrong announcement of pressure support
  Input: lpc32xx-keys - select INPUT_MATRIXKMAP
  Input: pxa27x_keypad - clear pending interrupts on keypad config
  Input: wacom - correct bad Cintiq 24HD check
  Input: wacom - add INPUT_PROP_DIRECT flag to Cintiq 24HD
  Input: egalax_ts - get gpio from devicetree
parents 23e44302 32ed1911

Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* EETI eGalax Multiple Touch Controller



Required properties:

- compatible: must be "eeti,egalax_ts"

- reg: i2c slave address

- interrupt-parent: the phandle for the interrupt controller

- interrupts: touch controller interrupt

- wakeup-gpios: the gpio pin to be used for waking up the controller

  as well as uased as irq pin



Example:



	egalax_ts@04 {

		compatible = "eeti,egalax_ts";

		reg = <0x04>;

		interrupt-parent = <&gpio1>;

		interrupts = <9 2>;

		wakeup-gpios = <&gpio1 9 0>;

	};

drivers/input/keyboard/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ config KEYBOARD_LOCOMO 
config KEYBOARD_LPC32XX

	tristate "LPC32XX matrix key scanner support"

	depends on ARCH_LPC32XX && OF

	select INPUT_MATRIXKMAP

	help

	  Say Y here if you want to use NXP LPC32XX SoC key scanner interface,

	  connected to a key matrix.

drivers/input/keyboard/pxa27x_keypad.c

+3 −0
Original line number Diff line number Diff line
@@ -368,6 +368,9 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad) 
	unsigned int mask = 0, direct_key_num = 0;

	unsigned long kpc = 0;



	/* clear pending interrupt bit */

	keypad_readl(KPC);



	/* enable matrix keys with automatic scan */

	if (pdata->matrix_key_rows && pdata->matrix_key_cols) {

		kpc |= KPC_ASACT | KPC_MIE | KPC_ME | KPC_MS_ALL;

drivers/input/tablet/wacom_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int wacom_parse_hid(struct usb_interface *intf, 
							features->pktlen = WACOM_PKGLEN_TPC2FG;

						}



						if (features->type == MTSCREEN || WACOM_24HDT)

						if (features->type == MTSCREEN || features->type == WACOM_24HDT)

							features->pktlen = WACOM_PKGLEN_MTOUCH;



						if (features->type == BAMBOO_PT) {

drivers/input/tablet/wacom_wac.c

+3 −0
Original line number Diff line number Diff line
@@ -1518,6 +1518,9 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev, 


		input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);

		input_set_abs_params(input_dev, ABS_THROTTLE, 0, 71, 0, 0);



		__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);



		wacom_setup_cintiq(wacom_wac);

		break;