Skip to content

Commit 765092e

Browse files
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - several device tree bindings for input devices have been converted to yaml - dropped no longer used ixp4xx-beeper and CSR Prima2 PWRC drivers - analog joystick has been converted to use ktime API and no longer warn about low resolution timers - a few driver fixes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (24 commits) Input: analog - always use ktime functions Input: mms114 - support MMS134S Input: elan_i2c - reduce the resume time for controller in Whitebox Input: edt-ft5x06 - added case for EDT EP0110M09 Input: adc-keys - drop bogus __refdata annotation Input: Fix spelling mistake in Kconfig "useable" -> "usable" Input: Fix spelling mistake in Kconfig "Modul" -> "Module" Input: remove dead CSR Prima2 PWRC driver Input: adp5589-keys - use the right header Input: adp5588-keys - use the right header dt-bindings: input: tsc2005: Convert to YAML schema Input: ep93xx_keypad - prepare clock before using it dt-bindings: input: sun4i-lradc: Add wakeup-source dt-bindings: input: Convert Regulator Haptic binding to a schema dt-bindings: input: Convert Pixcir Touchscreen binding to a schema dt-bindings: input: Convert ChipOne ICN8318 binding to a schema Input: pm8941-pwrkey - fix comma vs semicolon issue dt-bindings: power: reset: qcom-pon: Convert qcom PON binding to yaml dt-bindings: input: pm8941-pwrkey: Convert pm8941 power key binding to yaml dt-bindings: power: reset: Change 'additionalProperties' to true ...
2 parents 926de8c + 0c5483a commit 765092e

31 files changed

+472
-799
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ properties:
2929
description:
3030
Regulator for the LRADC reference voltage
3131

32+
wakeup-source: true
33+
3234
patternProperties:
3335
"^button-[0-9]+$":
3436
type: object

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

Lines changed: 0 additions & 55 deletions
This file was deleted.
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 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/qcom,pm8941-pwrkey.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm PM8941 PMIC Power Key
8+
9+
maintainers:
10+
- Courtney Cavin <[email protected]>
11+
- Vinod Koul <[email protected]>
12+
13+
allOf:
14+
- $ref: input.yaml#
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- qcom,pm8941-pwrkey
20+
- qcom,pm8941-resin
21+
- qcom,pmk8350-pwrkey
22+
- qcom,pmk8350-resin
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
debounce:
28+
description: |
29+
Time in microseconds that key must be pressed or
30+
released for state change interrupt to trigger.
31+
$ref: /schemas/types.yaml#/definitions/uint32
32+
33+
bias-pull-up:
34+
description: |
35+
Presence of this property indicates that the KPDPWR_N
36+
pin should be configured for pull up.
37+
$ref: /schemas/types.yaml#/definitions/flag
38+
39+
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.
45+
46+
required:
47+
- compatible
48+
- interrupts
49+
50+
unevaluatedProperties: false
51+
...

Documentation/devicetree/bindings/input/regulator-haptic.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/input/regulator-haptic.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: Regulator Haptic Device Tree Bindings
8+
9+
maintainers:
10+
- Jaewon Kim <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: regulator-haptic
15+
16+
haptic-supply:
17+
description: >
18+
Power supply to the haptic motor
19+
20+
max-microvolt:
21+
description: >
22+
The maximum voltage value supplied to the haptic motor
23+
24+
min-microvolt:
25+
description: >
26+
The minimum voltage value supplied to the haptic motor
27+
28+
required:
29+
- compatible
30+
- haptic-supply
31+
- max-microvolt
32+
- min-microvolt
33+
34+
additionalProperties: false
35+
36+
examples:
37+
- |
38+
haptics {
39+
compatible = "regulator-haptic";
40+
haptic-supply = <&motor_regulator>;
41+
max-microvolt = <2700000>;
42+
min-microvolt = <1100000>;
43+
};
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/touchscreen/chipone,icn8318.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ChipOne ICN8318 Touchscreen Controller Device Tree Bindings
8+
9+
maintainers:
10+
- Dmitry Torokhov <[email protected]>
11+
12+
allOf:
13+
- $ref: touchscreen.yaml#
14+
15+
properties:
16+
compatible:
17+
const: chipone,icn8318
18+
19+
reg:
20+
maxItems: 1
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
wake-gpios:
26+
maxItems: 1
27+
28+
unevaluatedProperties: false
29+
30+
required:
31+
- compatible
32+
- reg
33+
- interrupts
34+
- wake-gpios
35+
- touchscreen-size-x
36+
- touchscreen-size-y
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/gpio/gpio.h>
41+
#include <dt-bindings/interrupt-controller/arm-gic.h>
42+
43+
i2c {
44+
#address-cells = <1>;
45+
#size-cells = <0>;
46+
47+
touchscreen@40 {
48+
compatible = "chipone,icn8318";
49+
reg = <0x40>;
50+
interrupt-parent = <&pio>;
51+
interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* EINT9 (PG9) */
52+
pinctrl-names = "default";
53+
pinctrl-0 = <&ts_wake_pin_p66>;
54+
wake-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
55+
touchscreen-size-x = <800>;
56+
touchscreen-size-y = <480>;
57+
touchscreen-inverted-x;
58+
touchscreen-swapped-x-y;
59+
};
60+
};
61+
62+
...

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

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/touchscreen/pixcir,pixcir_ts.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Pixcir Touchscreen Controller Device Tree Bindings
8+
9+
maintainers:
10+
- Dmitry Torokhov <[email protected]>
11+
12+
allOf:
13+
- $ref: touchscreen.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- pixcir,pixcir_ts
19+
- pixcir,pixcir_tangoc
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
attb-gpio:
28+
maxItems: 1
29+
30+
reset-gpios:
31+
maxItems: 1
32+
33+
enable-gpios:
34+
maxItems: 1
35+
36+
wake-gpios:
37+
maxItems: 1
38+
39+
unevaluatedProperties: false
40+
41+
required:
42+
- compatible
43+
- reg
44+
- interrupts
45+
- attb-gpio
46+
- touchscreen-size-x
47+
- touchscreen-size-y
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/gpio/gpio.h>
52+
#include <dt-bindings/interrupt-controller/arm-gic.h>
53+
54+
i2c {
55+
#address-cells = <1>;
56+
#size-cells = <0>;
57+
58+
touchscreen@5c {
59+
compatible = "pixcir,pixcir_ts";
60+
reg = <0x5c>;
61+
interrupts = <2 0>;
62+
attb-gpio = <&gpf 2 0 2>;
63+
touchscreen-size-x = <800>;
64+
touchscreen-size-y = <600>;
65+
};
66+
};
67+
68+
...

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

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

0 commit comments

Comments
 (0)