Commit 348e77b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'input-for-v7.0-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input updates from Dmitry Torokhov:

 - support for FocalTech FT8112 added to i2c-hid driver

 - support for FocalTech FT3518 added to edt-ft5x06 driver

 - support for power buttons in TWL603x chips added to twl4030-pwrbutton
   driver

 - an update to gpio-decoder driver to make it usable on non-OF
   platforms and to clean up the code

 - an update to synaptics_i2c driver switching it to use managed
   resources and a fix to restarting polling after resume

 - an update to gpio-keys driver to fall back to getting IRQ from
   resources if not specified using other means

 - an update to ili210x driver to support polling mode

 - a number of input drivers switched to scnprintf() to suppress
   truncation warnings

 - a number of updates and conversions of device tree bindings to yaml
   format

 - fixes to spelling in comments and messages in several drivers

 - other assorted fixups

* tag 'input-for-v7.0-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  dt-bindings: input: qcom,pm8941-pwrkey: Document PMM8654AU
  dt-bindings: input: touchscreen: imagis: allow linux,keycodes for ist3038
  Input: apbps2 - fix comment style and typos
  Input: gpio_keys - fall back to platform_get_irq() for interrupt-only keys
  Input: novatek-nvt-ts - drop wake_type check
  dt-bindings: input: touchscreen: tsc2007: document '#io-channel-cells'
  Input: ili210x - add support for polling mode
  dt-bindings: touchscreen: trivial-touch: Drop 'interrupts' requirement for old Ilitek
  Input: appletouch - fix potential race between resume and open
  HID: i2c-hid: Add FocalTech FT8112
  dt-bindings: input: i2c-hid: Introduce FocalTech FT8112
  Input: synaptics_i2c - switch to using managed resources
  Input: synaptics_i2c - guard polling restart in resume
  Input: gpio_decoder - don't use "proxy" headers
  Input: gpio_decoder - make use of the macros from bits.h
  Input: gpio_decoder - replace custom loop by gpiod_get_array_value_cansleep()
  Input: gpio_decoder - unify messages with help of dev_err_probe()
  Input: gpio_decoder - make use of device properties
  Input: serio - complete sizeof(*pointer) conversions
  Input: wdt87xx_i2c - switch to use dev_err_probe()
  ...
parents 13c916af 273a171d

Documentation/devicetree/bindings/goldfish/events.txt

deleted100644 → 0
+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>;

	};

Documentation/devicetree/bindings/input/focaltech,ft8112.yaml

0 → 100644
+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>;

      };

    };

Documentation/devicetree/bindings/input/google,goldfish-events-keypad.yaml

0 → 100644
+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>;

    };

Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.yaml

+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

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ properties: 
      - edt,edt-ft5406

      - edt,edt-ft5506

      - evervision,ev-ft5726

      - focaltech,ft3518

      - focaltech,ft5426

      - focaltech,ft5452

      - focaltech,ft6236