Skip to content

Commit 348e77b

Browse files
committed
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() ...
2 parents 13c916a + 273a171 commit 348e77b

50 files changed

Lines changed: 518 additions & 512 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/devicetree/bindings/goldfish/events.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/focaltech,ft8112.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: FocalTech FT8112 touchscreen controller
8+
9+
maintainers:
10+
- Daniel Peng <Daniel_Peng@pegatron.corp-partner.google.com>
11+
12+
description:
13+
Supports the FocalTech FT8112 touchscreen controller.
14+
This touchscreen controller uses the i2c-hid protocol with a reset GPIO.
15+
16+
allOf:
17+
- $ref: /schemas/input/touchscreen/touchscreen.yaml#
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- focaltech,ft8112
23+
24+
reg:
25+
maxItems: 1
26+
27+
interrupts:
28+
maxItems: 1
29+
30+
panel: true
31+
32+
reset-gpios:
33+
maxItems: 1
34+
35+
vcc33-supply: true
36+
37+
vccio-supply: true
38+
39+
required:
40+
- compatible
41+
- reg
42+
- interrupts
43+
- vcc33-supply
44+
45+
additionalProperties: false
46+
47+
examples:
48+
- |
49+
#include <dt-bindings/gpio/gpio.h>
50+
#include <dt-bindings/interrupt-controller/irq.h>
51+
52+
i2c {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
56+
touchscreen@38 {
57+
compatible = "focaltech,ft8112";
58+
reg = <0x38>;
59+
60+
interrupt-parent = <&pio>;
61+
interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
62+
63+
reset-gpios = <&pio 126 GPIO_ACTIVE_LOW>;
64+
vcc33-supply = <&pp3300_tchscr_x>;
65+
};
66+
};
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/google,goldfish-events-keypad.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Android Goldfish Events Keypad
8+
9+
maintainers:
10+
- Kuan-Wei Chiu <visitorckw@gmail.com>
11+
12+
allOf:
13+
- $ref: input.yaml#
14+
15+
description:
16+
Android goldfish events keypad device generated by android emulator.
17+
18+
properties:
19+
compatible:
20+
const: google,goldfish-events-keypad
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
required:
29+
- compatible
30+
- reg
31+
- interrupts
32+
33+
unevaluatedProperties: false
34+
35+
examples:
36+
- |
37+
keypad@9040000 {
38+
compatible = "google,goldfish-events-keypad";
39+
reg = <0x9040000 0x1000>;
40+
interrupts = <5>;
41+
};

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,18 @@ maintainers:
1212

1313
properties:
1414
compatible:
15-
enum:
16-
- qcom,pm8941-pwrkey
17-
- qcom,pm8941-resin
18-
- qcom,pmk8350-pwrkey
19-
- qcom,pmk8350-resin
15+
oneOf:
16+
- enum:
17+
- qcom,pm8941-pwrkey
18+
- qcom,pm8941-resin
19+
- qcom,pmk8350-pwrkey
20+
- qcom,pmk8350-resin
21+
- items:
22+
- const: qcom,pmm8654au-pwrkey
23+
- const: qcom,pmk8350-pwrkey
24+
- items:
25+
- const: qcom,pmm8654au-resin
26+
- const: qcom,pmk8350-resin
2027

2128
interrupts:
2229
maxItems: 1

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ properties:
3939
- edt,edt-ft5406
4040
- edt,edt-ft5506
4141
- evervision,ev-ft5726
42+
- focaltech,ft3518
4243
- focaltech,ft5426
4344
- focaltech,ft5452
4445
- focaltech,ft6236
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/touchscreen/ilitek,ili210x.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ilitek ILI21xx/ILI251x V3/V6 touch screen controller with i2c interface
8+
9+
maintainers:
10+
- Frank Li <Frank.Li@nxp.com>
11+
- Marek Vasut <marek.vasut+renesas@mailbox.org>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- ilitek,ili210x
17+
- ilitek,ili2117
18+
- ilitek,ili2120
19+
- ilitek,ili251x
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
reset-gpios:
28+
maxItems: 1
29+
30+
wakeup-source: true
31+
32+
required:
33+
- compatible
34+
- reg
35+
36+
allOf:
37+
- $ref: touchscreen.yaml
38+
39+
unevaluatedProperties: false
40+
41+
examples:
42+
- |
43+
i2c {
44+
#address-cells = <1>;
45+
#size-cells = <0>;
46+
47+
touchscreen@41 {
48+
compatible = "ilitek,ili2120";
49+
reg = <0x41>;
50+
};
51+
};

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ allOf:
5555
properties:
5656
compatible:
5757
contains:
58-
const: imagis,ist3032c
58+
enum:
59+
- imagis,ist3032c
60+
- imagis,ist3038
5961
then:
6062
properties:
6163
linux,keycodes: false

Documentation/devicetree/bindings/input/touchscreen/sitronix,st1232.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- sitronix,st1232
19-
- sitronix,st1633
17+
oneOf:
18+
- enum:
19+
- sitronix,st1232
20+
- sitronix,st1633
21+
- items:
22+
- const: sitronix,st1624
23+
- const: sitronix,st1633
2024

2125
reg:
2226
maxItems: 1

Documentation/devicetree/bindings/input/touchscreen/ti,tsc2007.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ properties:
5353
how much time to wait (in milliseconds) before reading again the
5454
values from the tsc2007.
5555

56+
"#io-channel-cells":
57+
const: 1
58+
5659
required:
5760
- compatible
5861
- reg

Documentation/devicetree/bindings/input/touchscreen/trivial-touch.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,13 @@ properties:
2323
# Hynitron cstxxx series touchscreen controller
2424
- hynitron,cst340
2525
# Ilitek I2C Touchscreen Controller
26-
- ilitek,ili210x
27-
- ilitek,ili2117
28-
- ilitek,ili2120
2926
- ilitek,ili2130
3027
- ilitek,ili2131
3128
- ilitek,ili2132
3229
- ilitek,ili2316
3330
- ilitek,ili2322
3431
- ilitek,ili2323
3532
- ilitek,ili2326
36-
- ilitek,ili251x
3733
- ilitek,ili2520
3834
- ilitek,ili2521
3935
# MAXI MAX11801 Resistive touch screen controller with i2c interface

0 commit comments

Comments
 (0)