Commit 3e069ada 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:
 "Items of note:

   - evdev users can now limit or mask the kind of events they will
     receive.  This will allow applications such as power manager or
     network manager to only be woken when user presses special keys
     such as KEY_POWER or KEY_WIFI and not be bothered with ordinary
     key presses coming from keyboard

   - support for FocalTech FT6236 touchscreen controller

   - support for ROHM BU21023/24 touchscreen controller

   - edt-ft5x06 touchscreen driver got a face lift and can now be used
     with FT5506

   - support for Google Fiber TV Box remote controls

   - improvements in xpad driver (with more to come)

   - several parport-based drivers have been switched to the new device
     model

   - other miscellaneous driver improvements"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (70 commits)
  HID: hid-gfrm: avoid warning for input_configured API change
  HID: hid-input: allow input_configured callback return errors
  Input: evdev - fix bug in checking duplicate clock change request
  Input: add userio module
  Input: evdev - add event-mask API
  Input: snvs_pwrkey - remove duplicated semicolon
  HID: hid-gfrm: Google Fiber TV Box remote controls
  Input: e3x0-button - update Kconfig description
  Input: tegra-kbc - drop use of IRQF_NO_SUSPEND flag
  Input: tegra-kbc - enable support for the standard "wakeup-source" property
  Input: xen - check return value of xenbus_printf
  Input: hp_sdc_rtc - fix y2038 problem in proc_show
  Input: nomadik-ske-keypad - fix a trivial typo
  Input: xpad - fix clash of presence handling with LED setting
  Input: edt-ft5x06 - work around FT5506 firmware bug
  Input: edt-ft5x06 - add support for FT5506
  Input: edt-ft5x06 - add support for different max support points
  Input: edt-ft5x06 - use max support points to determine how much to read
  Input: rotary-encoder - add support for quarter-period mode
  Input: rotary-encoder - use of_property_read_bool
  ...
parents 02f0d3f7 e60e063c

Documentation/devicetree/bindings/input/da9062-onkey.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
* Dialog DA9062/63 OnKey Module



This module is part of the DA9062/DA9063. For more details about entire

chips see Documentation/devicetree/bindings/mfd/da9062.txt and

Documentation/devicetree/bindings/mfd/da9063.txt



This module provides KEY_POWER, KEY_SLEEP and events.



Required properties:



- compatible: should be one of:

	dlg,da9062-onkey

	dlg,da9063-onkey



Optional properties:



  - dlg,disable-key-power : Disable power-down using a long key-press. If this

    entry exists the OnKey driver will remove support for the KEY_POWER key

    press. If this entry does not exist then by default the key-press

    triggered power down is enabled and the OnKey will support both KEY_POWER

    and KEY_SLEEP.



Example:



	pmic0: da9062@58 {



		onkey {

			compatible = "dlg,da9063-onkey";

			dlg,disable-key-power;

		};



	};

Documentation/devicetree/bindings/input/gpio-keys-polled.txt

+8 −1
Original line number Diff line number Diff line
@@ -13,11 +13,18 @@ Subnode properties: 


	- gpios: OF device-tree gpio specification.

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.

	- linux,code: Key / Axis code to emit.



Optional subnode-properties:

	- linux,input-type: Specify event type this button/key generates.

	  If not specified defaults to <1> == EV_KEY.

	- linux,input-value: If linux,input-type is EV_ABS or EV_REL then this

	  value is sent for events this button generates when pressed.

	  EV_ABS/EV_REL axis will generate an event with a value of 0 when

	  all buttons with linux,input-type == type and linux,code == axis

	  are released. This value is interpreted as a signed 32 bit value,

	  e.g. to make a button generate a value of -1 use:

	  linux,input-value = <0xffffffff>; /* -1 */

	- debounce-interval: Debouncing interval time in milliseconds.

	  If not specified defaults to 5.

	- wakeup-source: Boolean, button can wake-up the system.

Documentation/devicetree/bindings/input/rotary-encoder.txt

+10 −0
Original line number Diff line number Diff line
@@ -14,7 +14,17 @@ Optional properties: 
  device, hence no steps need to be passed.

- rotary-encoder,rollover: Automatic rollove when the rotary value becomes

  greater than the specified steps or smaller than 0. For absolute axis only.

- rotary-encoder,steps-per-period: Number of steps (stable states) per period.

  The values have the following meaning:

  1: Full-period mode (default)

  2: Half-period mode

  4: Quarter-period mode

- wakeup-source: Boolean, rotary encoder can wake up the system.



Deprecated properties:

- rotary-encoder,half-period: Makes the driver work on half-period mode.

  This property is deprecated. Instead, a 'steps-per-period ' value should

  be used, such as "rotary-encoder,steps-per-period = <2>".



See Documentation/input/rotary-encoder.txt for more information.

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt

+5 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ There are 3 variants of the chip for various touch panel sizes 
FT5206GE1  2.8" .. 3.8"

FT5306DE4  4.3" .. 7"

FT5406EE8  7"   .. 8.9"

FT5506EEG  7"   .. 8.9"



The software interface is identical for all those chips, so that

currently there is no need for the driver to distinguish between the
@@ -17,6 +18,7 @@ Required properties: 
 - compatible:  "edt,edt-ft5206"

           or:  "edt,edt-ft5306"

           or:  "edt,edt-ft5406"

           or:  "edt,edt-ft5506"



 - reg:         I2C slave address of the chip (0x38)

 - interrupt-parent: a phandle pointing to the interrupt controller
@@ -49,7 +51,7 @@ Example: 
		pinctrl-names = "default";

		pinctrl-0 = <&edt_ft5x06_pins>;

		interrupt-parent = <&gpio2>;

		interrupts = <5 0>;

		reset-gpios = <&gpio2 6 1>;

		wake-gpios = <&gpio4 9 0>;

		interrupts = <5 IRQ_TYPE_EDGE_FALLING>;

		reset-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;

		wake-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;

	};

Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
* FocalTech FT6236 I2C touchscreen controller



Required properties:

 - compatible		  : "focaltech,ft6236"

 - reg			  : I2C slave address of the chip (0x38)

 - interrupt-parent	  : a phandle pointing to the interrupt controller

			    serving the interrupt for this chip

 - interrupts		  : interrupt specification for the touch controller

			    interrupt

 - reset-gpios		  : GPIO specification for the RSTN input

 - touchscreen-size-x	  : horizontal resolution of touchscreen (in pixels)

 - touchscreen-size-y	  : vertical resolution of touchscreen (in pixels)



Optional properties:

 - touchscreen-fuzz-x	  : horizontal noise value of the absolute input

			    device (in pixels)

 - touchscreen-fuzz-y	  : vertical noise value of the absolute input

			    device (in pixels)

 - touchscreen-inverted-x : X axis is inverted (boolean)

 - touchscreen-inverted-y : Y axis is inverted (boolean)

 - touchscreen-swapped-x-y: X and Y axis are swapped (boolean)

			    Swapping is done after inverting the axis



Example:



	ft6x06@38 {

		compatible = "focaltech,ft6236";

		reg = <0x38>;

		interrupt-parent = <&gpio>;

		interrupts = <23 2>;

		touchscreen-size-x = <320>;

		touchscreen-size-y = <480>;

		touchscreen-inverted-x;

		touchscreen-swapped-x-y;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE