Skip to content

Commit d00a834

Browse files
torvaldstorvalds
committed
Merge tag 'input-for-v6.16-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - support for game controllers requiring delayed initialization packets, such as ByoWave Proteus, in xpad driver - a change to atkbd driver to not reset the keyboard on Loongson devices - tweaks to gpio-keys and matrix_keypad drivers - fixes to documentation for Amiga joysticks - a fix to ims-pcu driver to better handle malformed firmware * tag 'input-for-v6.16-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ims-pcu - check record size in ims_pcu_flash_firmware() Input: gpio-keys - fix possible concurrent access in gpio_keys_irq_timer() Input: gpio-keys - fix a sleep while atomic with PREEMPT_RT Input: amijoy - make headings compliant w/ guidelines in documentation Input: amijoy - fix grammar in documentation Input: amijoy - fix Amiga 4-joystick adapter pinout in documentation Input: amijoy - fix broken table formatting in documentation Input: atkbd - do not reset keyboard by default on Loongson Input: xpad - send LED and auth done packets to all Xbox One controllers Input: xpad - add the ByoWave Proteus controller Input: xpad - allow delaying init packets MAINTAINERS: update dlg,da72??.txt to yaml dt-bindings: input: convert dlg,da7280.txt to dt-schema dt-bindings: input: touchscreen: edt-ft5x06: use unevaluatedProperties Input: snvs_pwrkey - support power-off-time-sec dt-bindings: crypto: fsl,sec-v4.0-mon: Add "power-off-time-sec" Input: matrix_keypad - detect change during scan Input: matrix_keypad - add function for reading row state
2 parents 4c3b7df + 4f97860 commit d00a834

File tree

12 files changed

+425
-194
lines changed

12 files changed

+425
-194
lines changed

‎Documentation/devicetree/bindings/crypto/fsl,sec-v4.0-mon.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ properties:
8383
by SNVS ONOFF, the driver can report the status of POWER key and wakeup
8484
system if pressed after system suspend.
8585

86+
$ref: /schemas/input/input.yaml
87+
8688
properties:
8789
compatible:
8890
const: fsl,sec-v4.0-pwrkey
@@ -111,6 +113,9 @@ properties:
111113
maxItems: 1
112114
default: 116
113115

116+
power-off-time-sec:
117+
enum: [0, 5, 10, 15]
118+
114119
required:
115120
- compatible
116121
- interrupts

‎Documentation/devicetree/bindings/input/dlg,da7280.txt

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

‎Documentation/devicetree/bindings/input/dlg,da7280.yaml

Lines changed: 248 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,248 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/dlg,da7280.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Dialog Semiconductor DA7280 Low Power High-Definition Haptic Driver
8+
9+
maintainers:
10+
- Roy Im <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: dlg,da7280
15+
16+
reg:
17+
maxItems: 1
18+
description: I2C address of the device.
19+
20+
interrupts:
21+
maxItems: 1
22+
23+
dlg,actuator-type:
24+
enum:
25+
- LRA # Linear Resonance Actuator type
26+
- ERM-bar # Bar type Eccentric Rotating Mass
27+
- ERM-coin # Coin type Eccentric Rotating Mass
28+
29+
dlg,const-op-mode:
30+
$ref: /schemas/types.yaml#/definitions/uint32
31+
enum:
32+
- 1 # Direct register override (DRO) mode triggered by i2c (default)
33+
- 2 # PWM data source mode controlled by PWM duty
34+
description:
35+
Haptic operation mode for FF_CONSTANT
36+
37+
dlg,periodic-op-mode:
38+
$ref: /schemas/types.yaml#/definitions/uint32
39+
enum:
40+
- 1 # Register triggered waveform memory(RTWM) mode, the pattern
41+
# assigned to the PS_SEQ_ID played as much times as PS_SEQ_LOOP
42+
- 2 # Edge triggered waveform memory(ETWM) mode, external GPI(N)
43+
# control are required to enable/disable and it needs to keep
44+
# device enabled by sending magnitude (X > 0),
45+
# the pattern is assigned to the GPI(N)_SEQUENCE_ID below
46+
default: 1
47+
description:
48+
Haptic operation mode for FF_PERIODIC.
49+
The default value is 1 for both of the operation modes.
50+
For more details, please see the datasheet
51+
52+
dlg,nom-microvolt:
53+
minimum: 0
54+
maximum: 6000000
55+
description:
56+
Nominal actuator voltage rating
57+
58+
dlg,abs-max-microvolt:
59+
minimum: 0
60+
maximum: 6000000
61+
description:
62+
Absolute actuator maximum voltage rating
63+
64+
dlg,imax-microamp:
65+
minimum: 0
66+
maximum: 252000
67+
default: 130000
68+
description:
69+
Actuator max current rating
70+
71+
dlg,impd-micro-ohms:
72+
minimum: 0
73+
maximum: 1500000000
74+
description:
75+
Impedance of the actuator
76+
77+
pwms:
78+
maxItems: 1
79+
80+
dlg,ps-seq-id:
81+
$ref: /schemas/types.yaml#/definitions/uint32
82+
minimum: 0
83+
maximum: 15
84+
description:
85+
The PS_SEQ_ID(pattern ID in waveform memory inside chip)
86+
to play back when RTWM-MODE is enabled
87+
88+
dlg,ps-seq-loop:
89+
$ref: /schemas/types.yaml#/definitions/uint32
90+
minimum: 0
91+
maximum: 15
92+
description:
93+
The PS_SEQ_LOOP, Number of times the pre-stored sequence pointed to by
94+
PS_SEQ_ID or GPI(N)_SEQUENCE_ID is repeated
95+
96+
dlg,gpi0-seq-id:
97+
$ref: /schemas/types.yaml#/definitions/uint32
98+
minimum: 0
99+
maximum: 15
100+
description:
101+
the GPI0_SEQUENCE_ID, pattern to play when gpi0 is triggered
102+
103+
dlg,gpi1-seq-id:
104+
$ref: /schemas/types.yaml#/definitions/uint32
105+
minimum: 0
106+
maximum: 15
107+
description:
108+
the GPI1_SEQUENCE_ID, pattern to play when gpi1 is triggered
109+
110+
dlg,gpi2-seq-id:
111+
$ref: /schemas/types.yaml#/definitions/uint32
112+
minimum: 0
113+
maximum: 15
114+
description:
115+
the GPI2_SEQUENCE_ID, pattern to play when gpi2 is triggered
116+
117+
dlg,gpi0-mode:
118+
enum:
119+
- Single-pattern
120+
- Multi-pattern
121+
description:
122+
Pattern mode for gpi0
123+
124+
dlg,gpi1-mode:
125+
enum:
126+
- Single-pattern
127+
- Multi-pattern
128+
description:
129+
Pattern mode for gpi1
130+
131+
dlg,gpi2-mode:
132+
enum:
133+
- Single-pattern
134+
- Multi-pattern
135+
description:
136+
Pattern mode for gpi2
137+
138+
dlg,gpi0-polarity:
139+
enum:
140+
- Rising-edge
141+
- Falling-edge
142+
- Both-edge
143+
description:
144+
gpi0 polarity, Haptic will work by this edge option in case of ETWM mode
145+
146+
dlg,gpi1-polarity:
147+
enum:
148+
- Rising-edge
149+
- Falling-edge
150+
- Both-edge
151+
description:
152+
gpi1 polarity, Haptic will work by this edge option in case of ETWM mode
153+
154+
dlg,gpi2-polarity:
155+
enum:
156+
- Rising-edge
157+
- Falling-edge
158+
- Both-edge
159+
description:
160+
gpi2 polarity, Haptic will work by this edge option in case of ETWM mode
161+
162+
dlg,resonant-freq-hz:
163+
minimum: 50
164+
maximum: 300
165+
default: 205
166+
167+
dlg,bemf-sens-enable:
168+
$ref: /schemas/types.yaml#/definitions/flag
169+
description:
170+
Enable for internal loop computations
171+
172+
dlg,freq-track-enable:
173+
$ref: /schemas/types.yaml#/definitions/flag
174+
description:
175+
Enable for resonant frequency tracking
176+
177+
dlg,acc-enable:
178+
$ref: /schemas/types.yaml#/definitions/flag
179+
description:
180+
Enable for active acceleration
181+
182+
dlg,rapid-stop-enable:
183+
$ref: /schemas/types.yaml#/definitions/flag
184+
description:
185+
Enable for rapid stop
186+
187+
dlg,amp-pid-enable:
188+
$ref: /schemas/types.yaml#/definitions/flag
189+
description:
190+
Enable for the amplitude PID
191+
192+
dlg,mem-array:
193+
$ref: /schemas/types.yaml#/definitions/uint32-array
194+
minItems: 100
195+
description:
196+
Customized waveform memory (patterns) data downloaded to the device during initialization.
197+
Each entry value must be included between 0 and 255.
198+
199+
required:
200+
- compatible
201+
- reg
202+
- interrupts
203+
- dlg,actuator-type
204+
- dlg,const-op-mode
205+
- dlg,periodic-op-mode
206+
- dlg,nom-microvolt
207+
- dlg,abs-max-microvolt
208+
- dlg,imax-microamp
209+
- dlg,impd-micro-ohms
210+
211+
additionalProperties: false
212+
213+
examples:
214+
- |
215+
#include <dt-bindings/gpio/gpio.h>
216+
#include <dt-bindings/interrupt-controller/irq.h>
217+
218+
i2c {
219+
#address-cells = <1>;
220+
#size-cells = <0>;
221+
222+
haptics@4a {
223+
compatible = "dlg,da7280";
224+
reg = <0x4a>;
225+
interrupt-parent = <&gpio6>;
226+
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
227+
dlg,actuator-type = "LRA";
228+
dlg,const-op-mode = <1>;
229+
dlg,periodic-op-mode = <1>;
230+
dlg,nom-microvolt = <2000000>;
231+
dlg,abs-max-microvolt = <2000000>;
232+
dlg,imax-microamp = <170000>;
233+
dlg,resonant-freq-hz = <180>;
234+
dlg,impd-micro-ohms = <10500000>;
235+
dlg,freq-track-enable;
236+
dlg,rapid-stop-enable;
237+
dlg,mem-array = <0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
238+
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
239+
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
240+
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
241+
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
242+
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
243+
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
244+
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
245+
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
246+
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00>;
247+
};
248+
};

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,9 @@ properties:
103103
minimum: 0
104104
maximum: 255
105105

106-
touchscreen-size-x: true
107-
touchscreen-size-y: true
108-
touchscreen-fuzz-x: true
109-
touchscreen-fuzz-y: true
110-
touchscreen-inverted-x: true
111-
touchscreen-inverted-y: true
112-
touchscreen-swapped-x-y: true
113106
interrupt-controller: true
114107

115-
additionalProperties: false
108+
unevaluatedProperties: false
116109

117110
required:
118111
- compatible

0 commit comments

Comments
 (0)