Commit aa240ee7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input updates from Dmitry Torokhov:

 - a revert of a patch resetting extra buttons on touchpads claiming to
   be buttonpads as this caused regression on certain Dell devices

 - a new driver for Mediatek MT6779 keypad

 - a new driver for Imagis touchscreen

 - rework of Google/Chrome OS "Vivaldi" keyboard handling

 - assorted driver fixes.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (31 commits)
  Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads"
  Input: adi - remove redundant variable z
  Input: add Imagis touchscreen driver
  dt-bindings: input/touchscreen: bindings for Imagis
  Input: synaptics - enable InterTouch on ThinkPad T14/P14s Gen 1 AMD
  Input: stmfts - fix reference leak in stmfts_input_open
  Input: add bounds checking to input_set_capability()
  Input: iqs5xx - use local input_dev pointer
  HID: google: modify HID device groups of eel
  HID: google: Add support for vivaldi to hid-hammer
  HID: google: extract Vivaldi hid feature mapping for use in hid-hammer
  Input: extract ChromeOS vivaldi physmap show function
  HID: google: switch to devm when registering keyboard backlight LED
  Input: mt6779-keypad - fix signedness bug
  Input: mt6779-keypad - add MediaTek keypad driver
  dt-bindings: input: Add bindings for Mediatek matrix keypad
  Input: da9063 - use devm_delayed_work_autocancel()
  Input: goodix - fix race on driver unbind
  Input: goodix - use input_copy_abs() helper
  Input: add input_copy_abs() function
  ...
parents 6a34fdcc 8b188fba

Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml

0 → 100644
+77 −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/mediatek,mt6779-keypad.yaml#

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



title: Mediatek's Keypad Controller device tree bindings



maintainers:

  - Fengping Yu <fengping.yu@mediatek.com>



allOf:

  - $ref: "/schemas/input/matrix-keymap.yaml#"



description: |

  Mediatek's Keypad controller is used to interface a SoC with a matrix-type

  keypad device. The keypad controller supports multiple row and column lines.

  A key can be placed at each intersection of a unique row and a unique column.

  The keypad controller can sense a key-press and key-release and report the

  event using a interrupt to the cpu.



properties:

  compatible:

    oneOf:

      - const: mediatek,mt6779-keypad

      - items:

          - enum:

              - mediatek,mt6873-keypad

          - const: mediatek,mt6779-keypad



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    items:

      - const: kpd



  wakeup-source:

    description: use any event on keypad as wakeup event

    type: boolean



  debounce-delay-ms:

    maximum: 256

    default: 16



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

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

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



    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        keyboard@10010000 {

          compatible = "mediatek,mt6779-keypad";

          reg = <0 0x10010000 0 0x1000>;

          interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_FALLING>;

          clocks = <&clk26m>;

          clock-names = "kpd";

        };

    };

Documentation/devicetree/bindings/input/mtk-pmic-keys.txt

+4 −1
Original line number Diff line number Diff line
@@ -9,7 +9,10 @@ For MT6397/MT6323 MFD bindings see: 
Documentation/devicetree/bindings/mfd/mt6397.txt



Required properties:

- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys"

- compatible: Should be one of:

	- "mediatek,mt6397-keys"

	- "mediatek,mt6323-keys"

	- "mediatek,mt6358-keys"

- linux,keycodes: See Documentation/devicetree/bindings/input/input.yaml



Optional Properties:

Documentation/devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml

0 → 100644
+74 −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/imagis,ist3038c.yaml#

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



title: Imagis IST30XXC family touchscreen controller bindings



maintainers:

  - Markuss Broks <markuss.broks@gmail.com>



allOf:

  - $ref: touchscreen.yaml#



properties:

  $nodename:

    pattern: "^touchscreen@[0-9a-f]+$"



  compatible:

    enum:

      - imagis,ist3038c



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  vdd-supply:

    description: Power supply regulator for the chip



  vddio-supply:

    description: Power supply regulator for the I2C bus



  touchscreen-size-x: true

  touchscreen-size-y: true

  touchscreen-fuzz-x: true

  touchscreen-fuzz-y: true

  touchscreen-inverted-x: true

  touchscreen-inverted-y: true

  touchscreen-swapped-x-y: true



additionalProperties: false



required:

  - compatible

  - reg

  - interrupts

  - touchscreen-size-x

  - touchscreen-size-y



examples:

  - |

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

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;

      touchscreen@50 {

        compatible = "imagis,ist3038c";

        reg = <0x50>;

        interrupt-parent = <&gpio>;

        interrupts = <13 IRQ_TYPE_EDGE_FALLING>;

        vdd-supply = <&ldo1_reg>;

        vddio-supply = <&ldo2_reg>;

        touchscreen-size-x = <720>;

        touchscreen-size-y = <1280>;

        touchscreen-fuzz-x = <10>;

        touchscreen-fuzz-y = <10>;

        touchscreen-inverted-x;

        touchscreen-inverted-y;

      };

    };



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -560,6 +560,8 @@ patternProperties: 
    description: Ingenieurburo Fur Ic-Technologie (I/F/I)

  "^ilitek,.*":

    description: ILI Technology Corporation (ILITEK)

  "^imagis,.*":

    description: Imagis Technologies Co., Ltd.

  "^img,.*":

    description: Imagination Technologies Ltd.

  "^imi,.*":

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -9517,6 +9517,12 @@ M: Stanislaw Gruszka <stf_xl@wp.pl> 
S:	Maintained

F:	drivers/usb/atm/ueagle-atm.c









IMAGIS TOUCHSCREEN DRIVER









M:	Markuss Broks <markuss.broks@gmail.com>









S:	Maintained









F:	Documentation/devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml









F:	drivers/input/touchscreen/imagis.c

















IMGTEC ASCII LCD DRIVER









M:	Paul Burton <paulburton@kernel.org>









S:	Maintained