Commit bf4ed217 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare input updates for 6.5 merge window.
parents feee70f4 8c9cce9c

Documentation/devicetree/bindings/input/atmel,maxtouch.yaml

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ description: | 
  Atmel maXTouch touchscreen or touchpads such as the mXT244

  and similar devices.



allOf:

  - $ref: input.yaml#



properties:

  compatible:

    const: atmel,maxtouch
@@ -60,6 +63,10 @@ properties: 
      or experiment to determine which bit corresponds to which input. Use

      KEY_RESERVED for unused padding values.



  linux,keycodes:

    minItems: 1

    maxItems: 8



  atmel,wakeup-method:

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

    description: |

Documentation/devicetree/bindings/input/cypress,cyapa.txt

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
Cypress I2C Touchpad



Required properties:

- compatible: must be "cypress,cyapa".

- reg: I2C address of the chip.

- interrupts: interrupt to which the chip is connected (see interrupt

	binding[0]).



Optional properties:

- wakeup-source: touchpad can be used as a wakeup source.

- pinctrl-names: should be "default" (see pinctrl binding [1]).

- pinctrl-0: a phandle pointing to the pin settings for the device (see

	pinctrl binding [1]).

- vcc-supply: a phandle for the regulator supplying 3.3V power.



[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt



Example:

	&i2c0 {

		/* ... */



		/* Cypress Gen3 touchpad */

		touchpad@67 {

			compatible = "cypress,cyapa";

			reg = <0x67>;

			interrupt-parent = <&gpio>;

			interrupts = <2 IRQ_TYPE_EDGE_FALLING>;	/* GPIO 2 */

			wakeup-source;

		};



		/* Cypress Gen5 and later touchpad */

		touchpad@24 {

			compatible = "cypress,cyapa";

			reg = <0x24>;

			interrupt-parent = <&gpio>;

			interrupts = <2 IRQ_TYPE_EDGE_FALLING>;	/* GPIO 2 */

			wakeup-source;

		};



		/* ... */

	};

Documentation/devicetree/bindings/input/cypress,cyapa.yaml

0 → 100644
+49 −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/cypress,cyapa.yaml#

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



title: Cypress All Points Addressable (APA) I2C Touchpad / Trackpad



maintainers:

  - Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>



properties:

  compatible:

    const: cypress,cyapa



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  wakeup-source: true



  vcc-supply:

    description: 3.3V power



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

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



    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        trackpad@67 {

            reg = <0x67>;

            compatible = "cypress,cyapa";

            interrupts = <2 IRQ_TYPE_EDGE_FALLING>;

            interrupt-parent = <&gpx1>;

            wakeup-source;

        };

    };

Documentation/devicetree/bindings/input/pwm-vibrator.yaml

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ properties: 
    minItems: 1

    maxItems: 2



  enable-gpios: true



  vcc-supply: true



  direction-duty-cycle-ns:

Documentation/devicetree/bindings/input/touchscreen/cypress,tt21000.yaml

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ properties: 
  linux,keycodes:

    description: EV_ABS specific event code generated by the axis.



  wakeup-source: true



patternProperties:

  "^button@[0-9]+$":

    type: object