Skip to content

Commit 9ae2940

Browse files
committed
Merge tag 'input-for-v6.12-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - support for PixArt PS/2 touchpad - updates to tsc2004/5, usbtouchscreen, and zforce_ts drivers - support for GPIO-only mode for ADP55888 controller - support for touch keys in Zinitix driver - support for querying density of Synaptics sensors - sysfs interface for Goodex "Berlin" devices to read and write touch IC registers - more quirks to i8042 to handle various Tuxedo laptops - a number of drivers have been converted to using "guard" notation when acquiring various locks, as well as using other cleanup functions to simplify releasing of resources (with more drivers to follow) - evdev will limit amount of data that can be written into an evdev instance at a given time to 4096 bytes (170 input events) to avoid holding evdev->mutex for too long and starving other users - Spitz has been converted to use software nodes/properties to describe its matrix keypad and GPIO-connected LEDs - msc5000_ts, msc_touchkey and keypad-nomadik-ske drivers have been removed since noone in mainline have been using them - other assorted cleanups and fixes * tag 'input-for-v6.12-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (98 commits) ARM: spitz: fix compile error when matrix keypad driver is enabled Input: hynitron_cstxxx - drop explicit initialization of struct i2c_device_id::driver_data to 0 Input: adp5588-keys - fix check on return code Input: Convert comma to semicolon Input: i8042 - add TUXEDO Stellaris 15 Slim Gen6 AMD to i8042 quirk table Input: i8042 - add another board name for TUXEDO Stellaris Gen5 AMD line Input: tegra-kbc - use of_property_read_variable_u32_array() and of_property_present() Input: ps2-gpio - use IRQF_NO_AUTOEN flag in request_irq() Input: ims-pcu - fix calling interruptible mutex Input: zforce_ts - switch to using asynchronous probing Input: zforce_ts - remove assert/deassert wrappers Input: zforce_ts - do not hardcode interrupt level Input: zforce_ts - switch to using devm_regulator_get_enable() Input: zforce_ts - stop treating VDD regulator as optional Input: zforce_ts - make zforce_idtable constant Input: zforce_ts - use dev_err_probe() where appropriate Input: zforce_ts - do not ignore errors when acquiring regulator Input: zforce_ts - make parsing of contacts less confusing Input: zforce_ts - switch to using get_unaligned_le16 Input: zforce_ts - use guard notation when acquiring mutexes ...
2 parents 6db6a19 + 358800b commit 9ae2940

Some content is hidden

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

82 files changed

+2501
-6038
lines changed

Documentation/devicetree/bindings/input/adi,adp5588.yaml

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ properties:
4949
interrupt-controller:
5050
description:
5151
This property applies if either keypad,num-rows lower than 8 or
52-
keypad,num-columns lower than 10.
52+
keypad,num-columns lower than 10. This property is optional if
53+
keypad,num-rows or keypad,num-columns are not specified as the
54+
device is then configured to be used purely for gpio during which
55+
interrupts may or may not be utilized.
5356

5457
'#interrupt-cells':
5558
const: 2
@@ -65,13 +68,23 @@ properties:
6568
minItems: 1
6669
maxItems: 2
6770

71+
dependencies:
72+
keypad,num-rows:
73+
- linux,keymap
74+
- keypad,num-columns
75+
keypad,num-columns:
76+
- linux,keymap
77+
- keypad,num-rows
78+
linux,keymap:
79+
- keypad,num-rows
80+
- keypad,num-columns
81+
- interrupts
82+
interrupt-controller:
83+
- interrupts
84+
6885
required:
6986
- compatible
7087
- reg
71-
- interrupts
72-
- keypad,num-rows
73-
- keypad,num-columns
74-
- linux,keymap
7588

7689
unevaluatedProperties: false
7790

@@ -108,4 +121,19 @@ examples:
108121
>;
109122
};
110123
};
124+
125+
- |
126+
#include <dt-bindings/gpio/gpio.h>
127+
i2c {
128+
#address-cells = <1>;
129+
#size-cells = <0>;
130+
gpio@34 {
131+
compatible = "adi,adp5588";
132+
reg = <0x34>;
133+
134+
#gpio-cells = <2>;
135+
gpio-controller;
136+
};
137+
};
138+
111139
...

Documentation/devicetree/bindings/input/rotary-encoder.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/rotary-encoder.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rotary encoder
8+
9+
maintainers:
10+
- Frank Li <Frank.Li@nxp.com>
11+
12+
description:
13+
See Documentation/input/devices/rotary-encoder.rst for more information.
14+
15+
properties:
16+
compatible:
17+
const: rotary-encoder
18+
19+
gpios:
20+
minItems: 2
21+
22+
linux,axis:
23+
default: 0
24+
description:
25+
the input subsystem axis to map to this rotary encoder.
26+
Defaults to 0 (ABS_X / REL_X)
27+
28+
rotary-encoder,steps:
29+
$ref: /schemas/types.yaml#/definitions/uint32
30+
default: 24
31+
description:
32+
Number of steps in a full turnaround of the
33+
encoder. Only relevant for absolute axis. Defaults to 24 which is a
34+
typical value for such devices.
35+
36+
rotary-encoder,relative-axis:
37+
$ref: /schemas/types.yaml#/definitions/flag
38+
description:
39+
register a relative axis rather than an
40+
absolute one. Relative axis will only generate +1/-1 events on the input
41+
device, hence no steps need to be passed.
42+
43+
rotary-encoder,rollover:
44+
$ref: /schemas/types.yaml#/definitions/int32
45+
description:
46+
Automatic rollover when the rotary value becomes
47+
greater than the specified steps or smaller than 0. For absolute axis only.
48+
49+
rotary-encoder,steps-per-period:
50+
$ref: /schemas/types.yaml#/definitions/uint32
51+
default: 1
52+
enum: [1, 2, 4]
53+
description: |
54+
Number of steps (stable states) per period.
55+
The values have the following meaning:
56+
1: Full-period mode (default)
57+
2: Half-period mode
58+
4: Quarter-period mode
59+
60+
wakeup-source: true
61+
62+
rotary-encoder,encoding:
63+
$ref: /schemas/types.yaml#/definitions/string
64+
description: the method used to encode steps.
65+
enum: [gray, binary]
66+
67+
rotary-encoder,half-period:
68+
$ref: /schemas/types.yaml#/definitions/flag
69+
deprecated: true
70+
description:
71+
Makes the driver work on half-period mode.
72+
This property is deprecated. Instead, a 'steps-per-period ' value should
73+
be used, such as "rotary-encoder,steps-per-period = <2>".
74+
75+
required:
76+
- compatible
77+
- gpios
78+
79+
additionalProperties: false
80+
81+
examples:
82+
- |
83+
rotary {
84+
compatible = "rotary-encoder";
85+
gpios = <&gpio 19 1>, <&gpio 20 0>; /* GPIO19 is inverted */
86+
linux,axis = <0>; /* REL_X */
87+
rotary-encoder,encoding = "gray";
88+
rotary-encoder,relative-axis;
89+
};
90+

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

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

0 commit comments

Comments
 (0)