Skip to content

Commit 86a0b42

Browse files
committed
Merge tag 'input-for-v6.2-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - a new driver for Cypress Generation 5 touchscreens - a new driver for Hynitron cstxxx touchscreens - a new driver for Himax hx83112b touchscreen - I2C input devices have been converted to use i2c's probe_new() - a large number of input devices are now using DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr() and no longer use __maybe_unused annotations - improvements to msg2638 touchscreen driver to also support msg2138 - conversion of several input deevine bindings to yaml/DT schema - changes to select touch drivers to move handling of wake irqs to the PM core - other assorted fixes and improvements. * tag 'input-for-v6.2-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (165 commits) Input: elants_i2c - delay longer with reset asserted dt-bindings: input: Convert ti,drv260x to DT schema dt-bindings: input: gpio-beeper: Convert to yaml schema Input: pxspad - fix unused data warning when force feedback not enabled Input: lpc32xx - allow building with COMPILE_TEST Input: nomadik-ske-keypad - allow building with COMPILE_TEST Input: pxa27xx-keypad - allow build with COMPILE_TEST Input: spear-keyboard - improve build coverage using COMPILE_TEST Input: tegra-kbc - allow build with COMPILE_TEST Input: tegra-kbc - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: tca6416-keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: tc3589x - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: st-keyscan - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: sh-keysc - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: qt1070 - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: pxa27x_keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: pmic8xxx-keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: nomadik-ske-keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: mcs-touchkey - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Input: max7359-keypad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() ...
2 parents 531d264 + e291c11 commit 86a0b42

File tree

134 files changed

+3098
-809
lines changed

Some content is hidden

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

134 files changed

+3098
-809
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ properties:
1616
- const: allwinner,sun4i-a10-lradc-keys
1717
- const: allwinner,sun8i-a83t-r-lradc
1818
- items:
19-
- const: allwinner,sun50i-a64-lradc
19+
- enum:
20+
- allwinner,suniv-f1c100s-lradc
21+
- allwinner,sun50i-a64-lradc
2022
- const: allwinner,sun8i-a83t-r-lradc
2123
- const: allwinner,sun50i-r329-lradc
2224
- items:

Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,6 @@ patternProperties:
473473
Specifies whether the event is to be interpreted as a key (1)
474474
or a switch (5).
475475

476-
required:
477-
- linux,code
478-
479476
additionalProperties: false
480477

481478
dependencies:
@@ -501,7 +498,7 @@ patternProperties:
501498

502499
azoteq,slider-size:
503500
$ref: /schemas/types.yaml#/definitions/uint32
504-
minimum: 0
501+
minimum: 1
505502
maximum: 65535
506503
description:
507504
Specifies the slider's one-dimensional resolution, equal to the
@@ -575,19 +572,19 @@ patternProperties:
575572
linux,code: true
576573

577574
azoteq,gesture-max-ms:
578-
multipleOf: 4
575+
multipleOf: 16
579576
minimum: 0
580-
maximum: 1020
577+
maximum: 4080
581578
description:
582579
Specifies the length of time (in ms) within which a tap, swipe
583580
or flick gesture must be completed in order to be acknowledged
584581
by the device. The number specified for any one swipe or flick
585582
gesture applies to all remaining swipe or flick gestures.
586583

587584
azoteq,gesture-min-ms:
588-
multipleOf: 4
585+
multipleOf: 16
589586
minimum: 0
590-
maximum: 124
587+
maximum: 496
591588
description:
592589
Specifies the length of time (in ms) for which a tap gesture must
593590
be held in order to be acknowledged by the device.
@@ -620,9 +617,6 @@ patternProperties:
620617
GPIO, they must all be of the same type (proximity, touch or
621618
slider gesture).
622619
623-
required:
624-
- linux,code
625-
626620
additionalProperties: false
627621

628622
required:
@@ -693,6 +687,7 @@ allOf:
693687
properties:
694688
azoteq,slider-size:
695689
multipleOf: 16
690+
minimum: 16
696691
maximum: 4080
697692

698693
azoteq,top-speed:
@@ -935,14 +930,14 @@ examples:
935930
936931
event-tap {
937932
linux,code = <KEY_PLAYPAUSE>;
938-
azoteq,gesture-max-ms = <600>;
939-
azoteq,gesture-min-ms = <24>;
933+
azoteq,gesture-max-ms = <400>;
934+
azoteq,gesture-min-ms = <32>;
940935
};
941936
942937
event-flick-pos {
943938
linux,code = <KEY_NEXTSONG>;
944-
azoteq,gesture-max-ms = <600>;
945-
azoteq,gesture-dist = <816>;
939+
azoteq,gesture-max-ms = <800>;
940+
azoteq,gesture-dist = <800>;
946941
};
947942
948943
event-flick-neg {

Documentation/devicetree/bindings/input/gpio-beeper.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/gpio-beeper.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: GPIO controlled beeper
8+
9+
maintainers:
10+
- Fabio Estevam <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: gpio-beeper
15+
16+
gpios:
17+
maxItems: 1
18+
description:
19+
GPIO that drives the beeper.
20+
21+
required:
22+
- compatible
23+
- gpios
24+
25+
additionalProperties: false
26+
27+
examples:
28+
- |
29+
#include <dt-bindings/gpio/gpio.h>
30+
beeper {
31+
compatible = "gpio-beeper";
32+
gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
33+
};
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/qcom,pm8921-pwrkey.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm PM8921 PMIC Power Key
8+
9+
maintainers:
10+
- Bjorn Andersson <[email protected]>
11+
12+
allOf:
13+
- $ref: input.yaml#
14+
15+
properties:
16+
compatible:
17+
oneOf:
18+
- enum:
19+
- qcom,pm8921-pwrkey
20+
- qcom,pm8058-pwrkey
21+
- items:
22+
- enum:
23+
- qcom,pm8018-pwrkey
24+
- const: qcom,pm8921-pwrkey
25+
26+
reg:
27+
maxItems: 1
28+
29+
interrupts:
30+
items:
31+
- description: key release
32+
- description: key press
33+
34+
debounce:
35+
description:
36+
Time in microseconds that key must be pressed or
37+
released for state change interrupt to trigger.
38+
$ref: /schemas/types.yaml#/definitions/uint32
39+
40+
pull-up:
41+
description:
42+
Presence of this property indicates that the KPDPWR_N
43+
pin should be configured for pull up.
44+
$ref: /schemas/types.yaml#/definitions/flag
45+
46+
required:
47+
- compatible
48+
- reg
49+
- interrupts
50+
51+
unevaluatedProperties: false
52+
53+
examples:
54+
- |
55+
#include <dt-bindings/interrupt-controller/irq.h>
56+
ssbi {
57+
#address-cells = <1>;
58+
#size-cells = <0>;
59+
60+
pmic@0 {
61+
reg = <0x0>;
62+
#address-cells = <1>;
63+
#size-cells = <0>;
64+
65+
pwrkey@1c {
66+
compatible = "qcom,pm8921-pwrkey";
67+
reg = <0x1c>;
68+
interrupt-parent = <&pmicint>;
69+
interrupts = <50 IRQ_TYPE_EDGE_RISING>, <51 IRQ_TYPE_EDGE_RISING>;
70+
debounce = <15625>;
71+
pull-up;
72+
};
73+
};
74+
};
75+
...

Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt

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

Documentation/devicetree/bindings/input/ti,drv260x.txt

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

0 commit comments

Comments
 (0)