Skip to content

Commit 6885d72

Browse files
committed
Merge tag 'input-for-v6.9-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - a new driver for Goodix Berlin I2C and SPI touch controllers - support for IQS7222D v1.1 and v1.2 in iqs7222 driver - support for IST3032C and IST3038B parts in Imagis touchscreen driver - support for touch keys for Imagis touchscreen controllers - support for Snakebyte GAMEPADs in xpad driver - various cleanups and conversions to yaml for device tree bindings - assorted fixes and cleanups - old Synaptics navpoint driver has been removed since the only board that used it (HP iPAQ hx4700) was removed a while ago. * tag 'input-for-v6.9-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (37 commits) Input: xpad - add support for Snakebyte GAMEPADs dt-bindings: input: samsung,s3c6410-keypad: convert to DT Schema Input: imagis - add touch key support dt-bindings: input: imagis: Document touch keys Input: imagis - use FIELD_GET where applicable Input: make input_class constant dt-bindings: input: atmel,captouch: convert bindings to YAML Input: iqs7222 - add support for IQS7222D v1.1 and v1.2 dt-bindings: input: allwinner,sun4i-a10-lrad: drop redundant type from label Input: serio - make serio_bus const Input: synaptics-rmi4 - make rmi_bus_type const Input: xilinx_ps2 - fix kernel-doc for xps2_of_probe function input/touchscreen: imagis: add support for IST3032C dt-bindings: input/touchscreen: imagis: add compatible for IST3032C input/touchscreen: imagis: Add support for Imagis IST3038B dt-bindings: input/touchscreen: Add compatible for IST3038B input/touchscreen: imagis: Correct the maximum touch area value Input: leds - change config symbol dependency for audio mute trigger Input: ti_am335x_tsc - remove redundant assignment to variable config Input: xpad - sort xpad_device by vendor and product ID ...
2 parents 741e9d6 + 57ed956 commit 6885d72

38 files changed

+1669
-671
lines changed

Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ patternProperties:
4949
$ref: input.yaml#
5050
properties:
5151
label:
52-
$ref: /schemas/types.yaml#/definitions/string
5352
description: Descriptive name of the key
5453

5554
linux,code: true

Documentation/devicetree/bindings/input/atmel,captouch.txt

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/atmel,captouch.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel capacitive touch device
8+
9+
maintainers:
10+
- Dharma balasubiramani <dharma.b@microchip.com>
11+
12+
description:
13+
Atmel capacitive touch device, typically an Atmel touch sensor connected to
14+
AtmegaXX MCU running firmware based on Qtouch library.
15+
16+
allOf:
17+
- $ref: input.yaml#
18+
19+
properties:
20+
compatible:
21+
const: atmel,captouch
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
linux,keycodes:
30+
minItems: 1
31+
maxItems: 8
32+
33+
required:
34+
- compatible
35+
- reg
36+
- interrupts
37+
- linux,keycodes
38+
39+
unevaluatedProperties: false
40+
41+
examples:
42+
- |
43+
#include <dt-bindings/interrupt-controller/irq.h>
44+
#include <dt-bindings/input/linux-event-codes.h>
45+
i2c {
46+
#address-cells = <1>;
47+
#size-cells = <0>;
48+
touch@51 {
49+
compatible = "atmel,captouch";
50+
reg = <0x51>;
51+
interrupt-parent = <&tlmm>;
52+
interrupts = <67 IRQ_TYPE_EDGE_FALLING>;
53+
linux,keycodes = <BTN_0>, <BTN_1>,
54+
<BTN_2>, <BTN_3>,
55+
<BTN_4>, <BTN_5>,
56+
<BTN_6>, <BTN_7>;
57+
autorepeat;
58+
};
59+
};
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/samsung,s3c6410-keypad.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung SoC series Keypad Controller
8+
9+
description:
10+
Samsung SoC Keypad controller is used to interface a SoC with a matrix-type
11+
keypad device. The keypad controller supports multiple row and column lines.
12+
A key can be placed at each intersection of a unique row and a unique column.
13+
The keypad controller can sense a key-press and key-release and report the
14+
event using a interrupt to the cpu.
15+
16+
maintainers:
17+
- Krzysztof Kozlowski <krzk@kernel.org>
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- samsung,s3c6410-keypad
23+
- samsung,s5pv210-keypad
24+
25+
reg:
26+
maxItems: 1
27+
28+
clocks:
29+
maxItems: 1
30+
31+
clock-names:
32+
items:
33+
- const: keypad
34+
35+
interrupts:
36+
maxItems: 1
37+
38+
wakeup-source: true
39+
40+
linux,input-no-autorepeat:
41+
type: boolean
42+
description:
43+
Do no enable autorepeat feature.
44+
45+
linux,input-wakeup:
46+
type: boolean
47+
deprecated: true
48+
49+
samsung,keypad-num-columns:
50+
$ref: /schemas/types.yaml#/definitions/uint32
51+
description:
52+
Number of column lines connected to the keypad controller.
53+
54+
samsung,keypad-num-rows:
55+
$ref: /schemas/types.yaml#/definitions/uint32
56+
description:
57+
Number of row lines connected to the keypad controller.
58+
59+
patternProperties:
60+
'^key-[0-9a-z]+$':
61+
type: object
62+
$ref: input.yaml#
63+
additionalProperties: false
64+
description:
65+
Each key connected to the keypad controller is represented as a child
66+
node to the keypad controller device node.
67+
68+
properties:
69+
keypad,column:
70+
$ref: /schemas/types.yaml#/definitions/uint32
71+
description: The column number to which the key is connected.
72+
73+
keypad,row:
74+
$ref: /schemas/types.yaml#/definitions/uint32
75+
description: The row number to which the key is connected.
76+
77+
linux,code: true
78+
79+
required:
80+
- keypad,column
81+
- keypad,row
82+
- linux,code
83+
84+
required:
85+
- compatible
86+
- reg
87+
- interrupts
88+
- samsung,keypad-num-columns
89+
- samsung,keypad-num-rows
90+
91+
additionalProperties: false
92+
93+
examples:
94+
- |
95+
#include <dt-bindings/clock/exynos4.h>
96+
#include <dt-bindings/interrupt-controller/arm-gic.h>
97+
98+
keypad@100a0000 {
99+
compatible = "samsung,s5pv210-keypad";
100+
reg = <0x100a0000 0x100>;
101+
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
102+
clocks = <&clock CLK_KEYIF>;
103+
clock-names = "keypad";
104+
105+
samsung,keypad-num-rows = <2>;
106+
samsung,keypad-num-columns = <8>;
107+
linux,input-no-autorepeat;
108+
wakeup-source;
109+
110+
key-1 {
111+
keypad,row = <0>;
112+
keypad,column = <3>;
113+
linux,code = <2>;
114+
};
115+
116+
key-2 {
117+
keypad,row = <0>;
118+
keypad,column = <4>;
119+
linux,code = <3>;
120+
};
121+
};

Documentation/devicetree/bindings/input/samsung-keypad.txt

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

0 commit comments

Comments
 (0)