Commit 273a171d authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus

Prepare input updates for 7.0 merge window.
parents 19a5d9ba ab2e361c
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>
@@ -690,6 +691,8 @@ Sachin Mokashi <sachin.mokashi@intel.com> <sachinx.mokashi@intel.com>
Sachin P Sant <ssant@in.ibm.com>
Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
Sam Protsenko <semen.protsenko@linaro.org>
Sam Protsenko <semen.protsenko@linaro.org> <semen.protsenko@globallogic.com>
Sam Ravnborg <sam@mars.ravnborg.org>
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
Santosh Shilimkar <santosh.shilimkar@oracle.org>
+0 −17
Original line number Diff line number Diff line
Android Goldfish Events Keypad

Android goldfish events keypad device generated by android emulator.

Required properties:

- compatible : should contain "google,goldfish-events-keypad" to match emulator
- reg        : <registers mapping>
- interrupts : <interrupt mapping>

Example:

	goldfish-events@9040000 {
		compatible = "google,goldfish-events-keypad";
		reg = <0x9040000 0x1000>;
		interrupts = <0x5>;
	};
+66 −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/focaltech,ft8112.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: FocalTech FT8112 touchscreen controller

maintainers:
  - Daniel Peng <Daniel_Peng@pegatron.corp-partner.google.com>

description:
  Supports the FocalTech FT8112 touchscreen controller.
  This touchscreen controller uses the i2c-hid protocol with a reset GPIO.

allOf:
  - $ref: /schemas/input/touchscreen/touchscreen.yaml#

properties:
  compatible:
    enum:
      - focaltech,ft8112

  reg:
    maxItems: 1

  interrupts:
    maxItems: 1

  panel: true

  reset-gpios:
    maxItems: 1

  vcc33-supply: true

  vccio-supply: true

required:
  - compatible
  - reg
  - interrupts
  - vcc33-supply

additionalProperties: false

examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/interrupt-controller/irq.h>

    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

      touchscreen@38 {
        compatible = "focaltech,ft8112";
        reg = <0x38>;

        interrupt-parent = <&pio>;
        interrupts = <15 IRQ_TYPE_LEVEL_LOW>;

        reset-gpios = <&pio 126 GPIO_ACTIVE_LOW>;
        vcc33-supply = <&pp3300_tchscr_x>;
      };
    };
+41 −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/google,goldfish-events-keypad.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Android Goldfish Events Keypad

maintainers:
  - Kuan-Wei Chiu <visitorckw@gmail.com>

allOf:
  - $ref: input.yaml#

description:
  Android goldfish events keypad device generated by android emulator.

properties:
  compatible:
    const: google,goldfish-events-keypad

  reg:
    maxItems: 1

  interrupts:
    maxItems: 1

required:
  - compatible
  - reg
  - interrupts

unevaluatedProperties: false

examples:
  - |
    keypad@9040000 {
        compatible = "google,goldfish-events-keypad";
        reg = <0x9040000 0x1000>;
        interrupts = <5>;
    };
+12 −5
Original line number Diff line number Diff line
@@ -12,11 +12,18 @@ maintainers:

properties:
  compatible:
    enum:
    oneOf:
      - enum:
          - qcom,pm8941-pwrkey
          - qcom,pm8941-resin
          - qcom,pmk8350-pwrkey
          - qcom,pmk8350-resin
      - items:
          - const: qcom,pmm8654au-pwrkey
          - const: qcom,pmk8350-pwrkey
      - items:
          - const: qcom,pmm8654au-resin
          - const: qcom,pmk8350-resin

  interrupts:
    maxItems: 1
Loading