Skip to content

Commit 99cedb6

Browse files
committed
Merge tag 'input-for-v6.18-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - Conversions to yaml/json schema and fixes for input-related device tree bindings - New drivers: - Awinic AW86927 haptic chip - Hynitron CST816x series controller - Himax HX852x(ES) touchscreen controller - Fix uinput to not leak kernel memory via a gap in uinput_ff_upload_compat structure - Prevent overflow in pressure calculation in tsc2007 driver causing phantom touches - Make the Atmel maxTouch driver support generic touchscreen configuration (flip, rotate, etc) - Drop support for platform data in tca8418_keypad, pxa27x-keypad, spear-keyboard and twl4030_keypad drivers, they all now rely on generic device properties for configuration - Other assorted changes and fixes * tag 'input-for-v6.18-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (50 commits) Input: atmel_mxt_ts - allow reset GPIO to sleep Input: aw86927 - fix error code in probe() Input: psxpad-spi - add a check for the return value of spi_setup() Input: uinput - zero-initialize uinput_ff_upload_compat to avoid info leak Input: aw86927 - add driver for Awinic AW86927 dt-bindings: input: Add Awinic AW86927 dt-bindings: touchscreen: remove touchscreen.txt dt-bindings: arm: bcm: raspberrypi,bcm2835-firmware: Add touchscreen child node dt-bindings: touchscreen: convert eeti bindings to json schema Input: pm8941-pwrkey - disable wakeup for resin by default dt-bindings: input: pm8941-pwrkey: Document wakeup-source property Input: add driver for Hynitron CST816x series dt-bindings: input: touchscreen: add hynitron cst816x series Input: imx6ul_tsc - set glitch threshold by DTS property dt-bindings: touchscreen: fsl,imx6ul-tsc: support glitch thresold dt-bindings: touchscreen: add debounce-delay-us property Input: ps2-gpio - fix typo Input: atmel_mxt_ts - add support for generic touchscreen configurations dt-bindings: input: maxtouch: add common touchscreen properties dt-bindings: touchscreen: convert zet6223 bindings to json schema ...
2 parents 7c8dcac + 8b87f67 commit 99cedb6

Some content is hidden

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

87 files changed

+2764
-1378
lines changed

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,28 @@ properties:
103103
- compatible
104104
- "#pwm-cells"
105105

106+
touchscreen:
107+
type: object
108+
$ref: /schemas/input/touchscreen/touchscreen.yaml#
109+
additionalProperties: false
110+
111+
properties:
112+
compatible:
113+
const: raspberrypi,firmware-ts
114+
115+
firmware:
116+
deprecated: true
117+
description: Phandle to RPi's firmware device node.
118+
119+
touchscreen-size-x: true
120+
touchscreen-size-y: true
121+
touchscreen-inverted-x: true
122+
touchscreen-inverted-y: true
123+
touchscreen-swapped-x-y: true
124+
125+
required:
126+
- compatible
127+
106128
required:
107129
- compatible
108130
- mboxes
@@ -135,5 +157,11 @@ examples:
135157
compatible = "raspberrypi,firmware-poe-pwm";
136158
#pwm-cells = <2>;
137159
};
160+
161+
ts: touchscreen {
162+
compatible = "raspberrypi,firmware-ts";
163+
touchscreen-size-x = <800>;
164+
touchscreen-size-y = <480>;
165+
};
138166
};
139167
...

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description: |
1616
1717
allOf:
1818
- $ref: input.yaml#
19+
- $ref: touchscreen/touchscreen.yaml#
1920

2021
properties:
2122
compatible:
@@ -95,7 +96,7 @@ required:
9596
- reg
9697
- interrupts
9798

98-
additionalProperties: false
99+
unevaluatedProperties: false
99100

100101
examples:
101102
- |
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/awinic,aw86927.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Awinic AW86927 LRA Haptic IC
8+
9+
maintainers:
10+
- Griffin Kroah-Hartman <griffin.kroah@fairphone.com>
11+
12+
properties:
13+
compatible:
14+
const: awinic,aw86927
15+
16+
reg:
17+
maxItems: 1
18+
19+
reset-gpios:
20+
maxItems: 1
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
required:
26+
- compatible
27+
- reg
28+
- reset-gpios
29+
- interrupts
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
#include <dt-bindings/gpio/gpio.h>
36+
#include <dt-bindings/interrupt-controller/irq.h>
37+
38+
i2c {
39+
#address-cells = <1>;
40+
#size-cells = <0>;
41+
42+
vibrator@5a {
43+
compatible = "awinic,aw86927";
44+
reg = <0x5a>;
45+
interrupts-extended = <&tlmm 101 IRQ_TYPE_EDGE_FALLING>;
46+
reset-gpios = <&tlmm 100 GPIO_ACTIVE_LOW>;
47+
};
48+
};

Documentation/devicetree/bindings/input/lpc32xx-key.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/nxp,lpc3220-key.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP LPC32xx Key Scan Interface
8+
9+
maintainers:
10+
- Frank Li <Frank.Li@nxp.com>
11+
12+
properties:
13+
compatible:
14+
const: nxp,lpc3220-key
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
clocks:
23+
maxItems: 1
24+
25+
nxp,debounce-delay-ms:
26+
description: Debounce delay in ms
27+
28+
nxp,scan-delay-ms:
29+
description: Repeated scan period in ms
30+
31+
required:
32+
- compatible
33+
- reg
34+
- interrupts
35+
- clocks
36+
- nxp,debounce-delay-ms
37+
- nxp,scan-delay-ms
38+
- linux,keymap
39+
40+
allOf:
41+
- $ref: matrix-keymap.yaml#
42+
43+
unevaluatedProperties: false
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/interrupt-controller/irq.h>
48+
#include <dt-bindings/clock/lpc32xx-clock.h>
49+
50+
key@40050000 {
51+
compatible = "nxp,lpc3220-key";
52+
reg = <0x40050000 0x1000>;
53+
clocks = <&clk LPC32XX_CLK_KEY>;
54+
interrupt-parent = <&sic1>;
55+
interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
56+
keypad,num-rows = <1>;
57+
keypad,num-columns = <1>;
58+
nxp,debounce-delay-ms = <3>;
59+
nxp,scan-delay-ms = <34>;
60+
linux,keymap = <0x00000002>;
61+
};

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

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ maintainers:
1010
- Courtney Cavin <courtney.cavin@sonymobile.com>
1111
- Vinod Koul <vkoul@kernel.org>
1212

13-
allOf:
14-
- $ref: input.yaml#
15-
1613
properties:
1714
compatible:
1815
enum:
@@ -25,23 +22,40 @@ properties:
2522
maxItems: 1
2623

2724
debounce:
28-
description: |
29-
Time in microseconds that key must be pressed or
30-
released for state change interrupt to trigger.
25+
description:
26+
Time in microseconds that key must be pressed or released for state
27+
change interrupt to trigger.
3128
$ref: /schemas/types.yaml#/definitions/uint32
3229

3330
bias-pull-up:
34-
description: |
35-
Presence of this property indicates that the KPDPWR_N
36-
pin should be configured for pull up.
31+
description:
32+
Presence of this property indicates that the KPDPWR_N pin should be
33+
configured for pull up.
3734
$ref: /schemas/types.yaml#/definitions/flag
3835

36+
wakeup-source:
37+
description:
38+
Button can wake-up the system. Only applicable for 'resin', 'pwrkey'
39+
always wakes the system by default.
40+
3941
linux,code:
40-
description: |
41-
The input key-code associated with the power key.
42-
Use the linux event codes defined in
43-
include/dt-bindings/input/linux-event-codes.h
44-
When property is omitted KEY_POWER is assumed.
42+
description:
43+
The input key-code associated with the power key. Use the linux event
44+
codes defined in include/dt-bindings/input/linux-event-codes.h.
45+
When property is omitted KEY_POWER is assumed.
46+
47+
allOf:
48+
- $ref: input.yaml#
49+
- if:
50+
properties:
51+
compatible:
52+
contains:
53+
enum:
54+
- qcom,pm8941-pwrkey
55+
- qcom,pmk8350-pwrkey
56+
then:
57+
properties:
58+
wakeup-source: false
4559

4660
required:
4761
- compatible

Documentation/devicetree/bindings/input/tca8418_keypad.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/ti,tca8418.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: TI TCA8418 I2C/SMBus keypad scanner
8+
9+
maintainers:
10+
- Frank Li <Frank.Li@nxp.com>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- ti,tca8418
16+
17+
reg:
18+
maxItems: 1
19+
20+
interrupts:
21+
maxItems: 1
22+
23+
required:
24+
- compatible
25+
- reg
26+
- interrupts
27+
28+
allOf:
29+
- $ref: matrix-keymap.yaml#
30+
31+
unevaluatedProperties: false
32+
33+
examples:
34+
- |
35+
#include <dt-bindings/input/input.h>
36+
#include <dt-bindings/interrupt-controller/irq.h>
37+
38+
i2c {
39+
#address-cells = <1>;
40+
#size-cells = <0>;
41+
42+
keypad@34 {
43+
compatible = "ti,tca8418";
44+
reg = <0x34>;
45+
interrupt-parent = <&gpio5>;
46+
interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
47+
keypad,num-rows = <4>;
48+
keypad,num-columns = <4>;
49+
linux,keymap = < MATRIX_KEY(0x00, 0x01, BTN_0)
50+
MATRIX_KEY(0x00, 0x00, BTN_1)
51+
MATRIX_KEY(0x01, 0x01, BTN_2)
52+
MATRIX_KEY(0x01, 0x00, BTN_3)
53+
MATRIX_KEY(0x02, 0x00, BTN_4)
54+
MATRIX_KEY(0x00, 0x03, BTN_5)
55+
MATRIX_KEY(0x00, 0x02, BTN_6)
56+
MATRIX_KEY(0x01, 0x03, BTN_7)
57+
MATRIX_KEY(0x01, 0x02, BTN_8)
58+
MATRIX_KEY(0x02, 0x02, BTN_9)
59+
>;
60+
};
61+
};

Documentation/devicetree/bindings/input/touchscreen/bu21013.txt

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)