Commit 0201710b authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare input updates for 6.13 merge window.
parents 5c822c0c 04337738

Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
      - mediatek,mt6331-keys

      - mediatek,mt6357-keys

      - mediatek,mt6358-keys

      - mediatek,mt6359-keys

      - mediatek,mt6397-keys



  power-off-time-sec: true

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ properties: 
      device, hence no steps need to be passed.



  rotary-encoder,rollover:

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

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

    description:

      Automatic rollover when the rotary value becomes

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

Documentation/devicetree/bindings/input/touchscreen/novatek,nvt-ts.yaml

0 → 100644
+62 −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/touchscreen/novatek,nvt-ts.yaml#

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



title: Novatek NVT Touchscreen Controller



maintainers:

  - Hans de Goede <hdegoede@redhat.com>



allOf:

  - $ref: touchscreen.yaml#



properties:

  compatible:

    enum:

      - novatek,nt11205-ts

      - novatek,nt36672a-ts



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  reset-gpios:

    maxItems: 1



  vcc-supply: true

  iovcc-supply: true



required:

  - compatible

  - reg

  - interrupts



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        touchscreen@1 {

            compatible = "novatek,nt36672a-ts";

            reg = <0x01>;

            interrupts-extended = <&tlmm 31 IRQ_TYPE_EDGE_RISING>;

            reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;

            vcc-supply = <&vreg_l22a_2p85>;

            iovcc-supply = <&vreg_l14a_1p8>;

            pinctrl-0 = <&ts_int_default &ts_reset_default>;

            pinctrl-1 = <&ts_int_sleep &ts_reset_sleep>;

            pinctrl-names = "default", "sleep";

            touchscreen-size-x = <1080>;

            touchscreen-size-y = <2246>;

        };

    };



...

Documentation/input/input.rst

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ events on a read. Their layout is:: 
	    struct timeval time;

	    unsigned short type;

	    unsigned short code;

	    unsigned int value;

	    int value;

    };



``time`` is the timestamp, it returns the time at which the event happened.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -16260,6 +16260,7 @@ NOVATEK NVT-TS I2C TOUCHSCREEN DRIVER 
M:	Hans de Goede <hdegoede@redhat.com>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/input/touchscreen/novatek,nvt-ts.yaml

F:	drivers/input/touchscreen/novatek-nvt-ts.c









NSDEPS