Commit 86a0b425 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull input updates from Dmitry Torokhov:

 - a new driver for Cypress Generation 5 touchscreens

 - a new driver for Hynitron cstxxx touchscreens

 - a new driver for Himax hx83112b touchscreen

 - I2C input devices have been converted to use i2c's probe_new()

 - a large number of input devices are now using
   DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr() and no longer use
   __maybe_unused annotations

 - improvements to msg2638 touchscreen driver to also support msg2138

 - conversion of several input deevine bindings to yaml/DT schema

 - changes to select touch drivers to move handling of wake irqs to the
   PM core

 - other assorted fixes and improvements.

* tag 'input-for-v6.2-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (165 commits)
  Input: elants_i2c - delay longer with reset asserted
  dt-bindings: input: Convert ti,drv260x to DT schema
  dt-bindings: input: gpio-beeper: Convert to yaml schema
  Input: pxspad - fix unused data warning when force feedback not enabled
  Input: lpc32xx - allow building with COMPILE_TEST
  Input: nomadik-ske-keypad - allow building with COMPILE_TEST
  Input: pxa27xx-keypad - allow build with COMPILE_TEST
  Input: spear-keyboard - improve build coverage using COMPILE_TEST
  Input: tegra-kbc - allow build with COMPILE_TEST
  Input: tegra-kbc - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: tca6416-keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: tc3589x - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: st-keyscan - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: sh-keysc - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: qt1070 - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: pxa27x_keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: pmic8xxx-keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: nomadik-ske-keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: mcs-touchkey - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  Input: max7359-keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  ...
parents 531d2644 e291c116
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ properties:
      - const: allwinner,sun4i-a10-lradc-keys
      - const: allwinner,sun8i-a83t-r-lradc
      - items:
          - const: allwinner,sun50i-a64-lradc
          - enum:
              - allwinner,suniv-f1c100s-lradc
              - allwinner,sun50i-a64-lradc
          - const: allwinner,sun8i-a83t-r-lradc
      - const: allwinner,sun50i-r329-lradc
      - items:
+10 −15
Original line number Diff line number Diff line
@@ -473,9 +473,6 @@ patternProperties:
              Specifies whether the event is to be interpreted as a key (1)
              or a switch (5).

        required:
          - linux,code

        additionalProperties: false

    dependencies:
@@ -501,7 +498,7 @@ patternProperties:

      azoteq,slider-size:
        $ref: /schemas/types.yaml#/definitions/uint32
        minimum: 0
        minimum: 1
        maximum: 65535
        description:
          Specifies the slider's one-dimensional resolution, equal to the
@@ -575,9 +572,9 @@ patternProperties:
          linux,code: true

          azoteq,gesture-max-ms:
            multipleOf: 4
            multipleOf: 16
            minimum: 0
            maximum: 1020
            maximum: 4080
            description:
              Specifies the length of time (in ms) within which a tap, swipe
              or flick gesture must be completed in order to be acknowledged
@@ -585,9 +582,9 @@ patternProperties:
              gesture applies to all remaining swipe or flick gestures.

          azoteq,gesture-min-ms:
            multipleOf: 4
            multipleOf: 16
            minimum: 0
            maximum: 124
            maximum: 496
            description:
              Specifies the length of time (in ms) for which a tap gesture must
              be held in order to be acknowledged by the device.
@@ -620,9 +617,6 @@ patternProperties:
              GPIO, they must all be of the same type (proximity, touch or
              slider gesture).

        required:
          - linux,code

        additionalProperties: false

    required:
@@ -693,6 +687,7 @@ allOf:
          properties:
            azoteq,slider-size:
              multipleOf: 16
              minimum: 16
              maximum: 4080

            azoteq,top-speed:
@@ -935,14 +930,14 @@ examples:

                            event-tap {
                                    linux,code = <KEY_PLAYPAUSE>;
                                    azoteq,gesture-max-ms = <600>;
                                    azoteq,gesture-min-ms = <24>;
                                    azoteq,gesture-max-ms = <400>;
                                    azoteq,gesture-min-ms = <32>;
                            };

                            event-flick-pos {
                                    linux,code = <KEY_NEXTSONG>;
                                    azoteq,gesture-max-ms = <600>;
                                    azoteq,gesture-dist = <816>;
                                    azoteq,gesture-max-ms = <800>;
                                    azoteq,gesture-dist = <800>;
                            };

                            event-flick-neg {
+0 −13
Original line number Diff line number Diff line
* GPIO beeper device tree bindings

Register a beeper connected to GPIO pin.

Required properties:
- compatible:	Should be "gpio-beeper".
- gpios:	From common gpio binding; gpio connection to beeper enable pin.

Example:
	beeper: beeper {
		compatible = "gpio-beeper";
		gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
	};
+33 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/input/gpio-beeper.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: GPIO controlled beeper

maintainers:
  - Fabio Estevam <festevam@denx.de>

properties:
  compatible:
    const: gpio-beeper

  gpios:
    maxItems: 1
    description:
      GPIO that drives the beeper.

required:
  - compatible
  - gpios

additionalProperties: false

examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
    beeper {
        compatible = "gpio-beeper";
        gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
    };
+75 −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/qcom,pm8921-pwrkey.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Qualcomm PM8921 PMIC Power Key

maintainers:
  - Bjorn Andersson <andersson@kernel.org>

allOf:
  - $ref: input.yaml#

properties:
  compatible:
    oneOf:
      - enum:
          - qcom,pm8921-pwrkey
          - qcom,pm8058-pwrkey
      - items:
          - enum:
              - qcom,pm8018-pwrkey
          - const: qcom,pm8921-pwrkey

  reg:
    maxItems: 1

  interrupts:
    items:
      - description: key release
      - description: key press

  debounce:
    description:
      Time in microseconds that key must be pressed or
      released for state change interrupt to trigger.
    $ref: /schemas/types.yaml#/definitions/uint32

  pull-up:
    description:
      Presence of this property indicates that the KPDPWR_N
      pin should be configured for pull up.
    $ref: /schemas/types.yaml#/definitions/flag

required:
  - compatible
  - reg
  - interrupts

unevaluatedProperties: false

examples:
  - |
   #include <dt-bindings/interrupt-controller/irq.h>
   ssbi {
     #address-cells = <1>;
     #size-cells = <0>;

     pmic@0 {
       reg = <0x0>;
       #address-cells = <1>;
       #size-cells = <0>;

       pwrkey@1c {
         compatible = "qcom,pm8921-pwrkey";
         reg = <0x1c>;
         interrupt-parent = <&pmicint>;
         interrupts = <50 IRQ_TYPE_EDGE_RISING>, <51 IRQ_TYPE_EDGE_RISING>;
         debounce = <15625>;
         pull-up;
       };
     };
   };
...
Loading