Commit 72c0870e 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:

 - updates to Ilitech driver to support ILI2117

 - face lift of st1232 driver to support MT-B protocol

 - a new driver for i.MX system controller keys

 - mpr121 driver now supports polling mode

 - various input drivers have been switched away from input_polled_dev
   to use polled mode of regular input devices

 - other assorted cleanups and fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (70 commits)
  Input: synaptics-rmi4 - fix various V4L2 compliance problems in F54
  Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus
  Input: fix Kconfig indentation
  Input: imx_sc_key - correct SCU message structure to avoid stack corruption
  Input: ili210x - optionally show calibrate sysfs attribute
  Input: ili210x - add resolution to chip operations structure
  Input: ili210x - do not retrieve/print chip firmware version
  Input: mms114 - use device_get_match_data
  Input: ili210x - remove unneeded suspend and resume handlers
  Input: ili210x - do not unconditionally mark touchscreen as wakeup source
  Input: ili210x - define and use chip operations structure
  Input: ili210x - do not set parent device explicitly
  Input: ili210x - handle errors from input_mt_init_slots()
  Input: ili210x - switch to using threaded IRQ
  Input: ili210x - add ILI2117 support
  dt-bindings: input: touchscreen: ad7879: generic node names in example
  Input: ar1021 - fix typo in preprocessor macro name
  Input: synaptics-rmi4 - simplify data read in rmi_f54_work
  Input: kxtj9 - switch to using polled mode of input devices
  Input: kxtj9 - switch to using managed resources
  ...
parents d10032dd 976e3645

Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

+14 −0
Original line number Diff line number Diff line
@@ -157,6 +157,15 @@ Required properties: 
Optional properties:

- timeout-sec: contains the watchdog timeout in seconds.



SCU key bindings based on SCU Message Protocol

------------------------------------------------------------



Required properties:

- compatible: should be:

              "fsl,imx8qxp-sc-key"

              followed by "fsl,imx-sc-key";

- linux,keycodes: See Documentation/devicetree/bindings/input/keys.txt



Example (imx8qxp):

-------------

aliases {
@@ -220,6 +229,11 @@ firmware { 
			compatible = "fsl,imx8qxp-sc-rtc";

		};



		scu_key: scu-key {

			compatible = "fsl,imx8qxp-sc-key", "fsl,imx-sc-key";

			linux,keycodes = <KEY_POWER>;

		};



		watchdog {

			compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";

			timeout-sec = <60>;

Documentation/devicetree/bindings/input/fsl,mpr121-touchkey.yaml

0 → 100644
+89 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/input/fsl,mpr121-touchkey.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Freescale MPR121 capacitive touch sensor controller



maintainers:

  - Dmitry Torokhov <dmitry.torokhov@gmail.com>



description: |

  The MPR121 supports up to 12 completely independent electrodes/capacitance

  sensing inputs in which 8 are multifunctional for LED driving and GPIO.

  https://www.nxp.com/docs/en/data-sheet/MPR121.pdf



allOf:

  - $ref: input.yaml#



anyOf:

  - required: [ interrupts ]

  - required: [ poll-interval ]



properties:

  compatible:

    const: fsl,mpr121-touchkey



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  vdd-supply:

    maxItems: 1



  linux,keycodes:

    minItems: 1

    maxItems: 12



  wakeup-source:

    description: Use any event on keypad as wakeup event.

    type: boolean



required:

  - compatible

  - reg

  - vdd-supply

  - linux,keycodes



examples:

  - |

    // Example with interrupts

    #include "dt-bindings/input/input.h"

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        mpr121@5a {

            compatible = "fsl,mpr121-touchkey";

            reg = <0x5a>;

            interrupt-parent = <&gpio1>;

            interrupts = <28 2>;

            autorepeat;

            vdd-supply = <&ldo4_reg>;

            linux,keycodes = <KEY_0>, <KEY_1>, <KEY_2>, <KEY_3>,

                             <KEY_4>, <KEY_5>, <KEY_6>, <KEY_7>,

                             <KEY_8>, <KEY_9>, <KEY_A>, <KEY_B>;

        };

    };



  - |

    // Example with polling

    #include "dt-bindings/input/input.h"

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        mpr121@5a {

            compatible = "fsl,mpr121-touchkey";

            reg = <0x5a>;

            poll-interval = <20>;

            autorepeat;

            vdd-supply = <&ldo4_reg>;

            linux,keycodes = <KEY_0>, <KEY_1>, <KEY_2>, <KEY_3>,

                             <KEY_4>, <KEY_5>, <KEY_6>, <KEY_7>,

                             <KEY_8>, <KEY_9>, <KEY_A>, <KEY_B>;

        };

    };

Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt

+2 −1
Original line number Diff line number Diff line 
Ilitek ILI210x/ILI251x touchscreen controller

Ilitek ILI210x/ILI2117/ILI251x touchscreen controller



Required properties:

- compatible:

    ilitek,ili210x for ILI210x

    ilitek,ili2117 for ILI2117

    ilitek,ili251x for ILI251x



- reg: The I2C address of the device

Documentation/devicetree/bindings/input/input.yaml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/input/input.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Common input schema binding



maintainers:

  - Dmitry Torokhov <dmitry.torokhov@gmail.com>



properties:

  autorepeat:

    description: Enable autorepeat when key is pressed and held down.

    type: boolean



  linux,keycodes:

    description:

      Specifies an array of numeric keycode values to be used for reporting

      button presses.

    allOf:

      - $ref: /schemas/types.yaml#/definitions/uint32-array

      - items:

          minimum: 0

          maximum: 0xff



  poll-interval:

    description: Poll interval time in milliseconds.

    $ref: /schemas/types.yaml#/definitions/uint32



  power-off-time-sec:

    description:

      Duration in seconds which the key should be kept pressed for device to

      power off automatically. Device with key pressed shutdown feature can

      specify this property.

    $ref: /schemas/types.yaml#/definitions/uint32

Documentation/devicetree/bindings/input/keys.txt

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
General Keys Properties:



Optional properties for Keys:

- power-off-time-sec: Duration in seconds which the key should be kept

	pressed for device to power off automatically. Device with key pressed

	shutdown feature can specify this property.

- linux,keycodes: Specifies the numeric keycode values to be used for

	reporting key presses.

CRA Git | Maintained and supported by SUSTech CRA and CCSE