-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/dtor/input Pull input updates from Dmitry Torokhov: - support for inhibiting input devices at request from userspace. If a device implements open/close methods, it can also put device into low power state. This is needed, for example, to disable keyboard and touchpad on convertibles when they are transitioned into tablet mode - now that ordinary input devices can be configured for polling mode, dedicated input polling device implementation has been removed - GTCO tablet driver has been removed, as it used problematic custom HID parser, devices are EOL, and there is no interest from the manufacturer - a new driver for Dialog DA7280 haptic chips has been introduced - a new driver for power button on Dell Wyse 3020 - support for eKTF2132 in ektf2127 driver - support for SC2721 and SC2730 in sc27xx-vibra driver - enhancements for Atmel touchscreens, AD7846 touchscreens, Elan touchpads, ADP5589, ST1232 touchscreen, TM2 touchkey drivers - fixes and cleanups to allow clean builds with W=1 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (86 commits) Input: da7280 - fix spelling mistake "sequemce" -> "sequence" Input: cyapa_gen6 - fix out-of-bounds stack access Input: sc27xx - add support for sc2730 and sc2721 dt-bindings: input: Add compatible string for SC2721 and SC2730 dt-bindings: input: Convert sc27xx-vibra.txt to json-schema Input: stmpe - add axis inversion and swapping capability Input: adp5589-keys - do not explicitly control IRQ for wakeup Input: adp5589-keys - do not unconditionally configure as wakeup source Input: ipx4xx-beeper - convert comma to semicolon Input: parkbd - convert comma to semicolon Input: new da7280 haptic driver dt-bindings: input: Add document bindings for DA7280 MAINTAINERS: da7280 updates to the Dialog Semiconductor search terms Input: elantech - fix protocol errors for some trackpoints in SMBus mode Input: elan_i2c - add new trackpoint report type 0x5F Input: elants - document some registers and values Input: atmel_mxt_ts - simplify the return expression of mxt_send_bootloader_cmd() Input: imx_keypad - add COMPILE_TEST support Input: applespi - use new structure for SPI transfer delays Input: synaptics-rmi4 - use new structure for SPI transfer delays ...
- Loading branch information
Showing
121 changed files
with
2,989 additions
and
2,381 deletions.
There are no files selected for viewing
57 changes: 57 additions & 0 deletions
57
Documentation/devicetree/bindings/input/ariel-pwrbutton.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/input/ariel-pwrbutton.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Dell Wyse 3020 a.k.a. "Ariel" Power Button | ||
|
||
maintainers: | ||
- Lubomir Rintel <lkundrak@v3.sk> | ||
|
||
description: | | ||
The ENE Embedded Controller on the Ariel board has an interface to the | ||
SPI bus that is capable of sending keyboard and mouse data. A single | ||
power button is attached to it. This binding describes this | ||
configuration. | ||
allOf: | ||
- $ref: input.yaml# | ||
|
||
properties: | ||
compatible: | ||
items: | ||
- const: dell,wyse-ariel-ec-input | ||
- const: ene,kb3930-input | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
spi-max-frequency: true | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
spi { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
power-button@0 { | ||
compatible = "dell,wyse-ariel-ec-input", "ene,kb3930-input"; | ||
reg = <0>; | ||
interrupt-parent = <&gpio>; | ||
interrupts = <60 IRQ_TYPE_EDGE_RISING>; | ||
spi-max-frequency = <33000000>; | ||
}; | ||
}; |
41 changes: 0 additions & 41 deletions
41
Documentation/devicetree/bindings/input/atmel,maxtouch.txt
This file was deleted.
Oops, something went wrong.
81 changes: 81 additions & 0 deletions
81
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/input/atmel,maxtouch.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Atmel maXTouch touchscreen/touchpad | ||
|
||
maintainers: | ||
- Nick Dyer <nick@shmanahar.org> | ||
- Linus Walleij <linus.walleij@linaro.org> | ||
|
||
description: | | ||
Atmel maXTouch touchscreen or touchpads such as the mXT244 | ||
and similar devices. | ||
properties: | ||
compatible: | ||
const: atmel,maxtouch | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
vdda-supply: | ||
description: | ||
Optional regulator for the AVDD analog voltage. | ||
|
||
vdd-supply: | ||
description: | ||
Optional regulator for the VDD digital voltage. | ||
|
||
reset-gpios: | ||
maxItems: 1 | ||
description: | ||
Optional GPIO specifier for the touchscreen's reset pin | ||
(active low). The line must be flagged with | ||
GPIO_ACTIVE_LOW. | ||
|
||
linux,gpio-keymap: | ||
$ref: /schemas/types.yaml#/definitions/uint32-array | ||
description: | | ||
When enabled, the SPT_GPIOPWN_T19 object sends messages | ||
on GPIO bit changes. An array of up to 8 entries can be provided | ||
indicating the Linux keycode mapped to each bit of the status byte, | ||
starting at the LSB. Linux keycodes are defined in | ||
<dt-bindings/input/input.h>. | ||
Note: the numbering of the GPIOs and the bit they start at varies | ||
between maXTouch devices. You must either refer to the documentation, | ||
or experiment to determine which bit corresponds to which input. Use | ||
KEY_RESERVED for unused padding values. | ||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
#include <dt-bindings/gpio/gpio.h> | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
touchscreen@4a { | ||
compatible = "atmel,maxtouch"; | ||
reg = <0x4a>; | ||
interrupt-parent = <&gpio>; | ||
interrupts = <26 IRQ_TYPE_EDGE_FALLING>; | ||
reset-gpios = <&gpio 27 GPIO_ACTIVE_LOW>; | ||
vdda-supply = <&ab8500_ldo_aux2_reg>; | ||
vdd-supply = <&ab8500_ldo_aux5_reg>; | ||
}; | ||
}; | ||
... |
33 changes: 0 additions & 33 deletions
33
Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt
This file was deleted.
Oops, something went wrong.
73 changes: 73 additions & 0 deletions
73
Documentation/devicetree/bindings/input/cypress,tm2-touchkey.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/input/cypress,tm2-touchkey.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Samsung TM2 touch key controller | ||
|
||
maintainers: | ||
- Stephan Gerhold <stephan@gerhold.net> | ||
|
||
description: | | ||
Touch key controllers similar to the TM2 can be found in a wide range of | ||
Samsung devices. They are implemented using many different MCUs, but use | ||
a similar I2C protocol. | ||
allOf: | ||
- $ref: input.yaml# | ||
|
||
properties: | ||
compatible: | ||
enum: | ||
- cypress,tm2-touchkey | ||
- cypress,midas-touchkey | ||
- cypress,aries-touchkey | ||
- coreriver,tc360-touchkey | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
vdd-supply: | ||
description: Optional regulator for LED voltage, 3.3V. | ||
|
||
vcc-supply: | ||
description: Optional regulator for MCU, 1.8V-3.3V (depending on MCU). | ||
|
||
vddio-supply: | ||
description: | | ||
Optional regulator that provides digital I/O voltage, | ||
e.g. for pulling up the interrupt line or the I2C pins. | ||
linux,keycodes: | ||
minItems: 1 | ||
maxItems: 4 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/input/input.h> | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
touchkey@20 { | ||
compatible = "cypress,tm2-touchkey"; | ||
reg = <0x20>; | ||
interrupt-parent = <&gpa3>; | ||
interrupts = <2 IRQ_TYPE_EDGE_FALLING>; | ||
vcc-supply = <&ldo32_reg>; | ||
vdd-supply = <&ldo33_reg>; | ||
linux,keycodes = <KEY_MENU KEY_BACK>; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
Dialog Semiconductor DA7280 Haptics bindings | ||
|
||
Required properties: | ||
- compatible: Should be "dlg,da7280". | ||
- reg: Specifies the I2C slave address. | ||
|
||
- interrupt-parent : Specifies the phandle of the interrupt controller to | ||
which the IRQs from DA7280 are delivered to. | ||
|
||
- dlg,actuator-type: Set Actuator type. it should be one of: | ||
"LRA" - Linear Resonance Actuator type. | ||
"ERM-bar" - Bar type Eccentric Rotating Mass. | ||
"ERM-coin" - Coin type Eccentric Rotating Mass. | ||
|
||
- dlg,const-op-mode: Haptic operation mode for FF_CONSTANT. | ||
Possible values: | ||
1 - Direct register override(DRO) mode triggered by i2c(default), | ||
2 - PWM data source mode controlled by PWM duty, | ||
- dlg,periodic-op-mode: Haptic operation mode for FF_PERIODIC. | ||
Possible values: | ||
1 - Register triggered waveform memory(RTWM) mode, the pattern | ||
assigned to the PS_SEQ_ID played as much times as PS_SEQ_LOOP, | ||
2 - Edge triggered waveform memory(ETWM) mode, external GPI(N) | ||
control are required to enable/disable and it needs to keep | ||
device enabled by sending magnitude (X > 0), | ||
the pattern is assigned to the GPI(N)_SEQUENCE_ID below. | ||
The default value is 1 for both of the operation modes. | ||
For more details, please see the datasheet. | ||
|
||
- dlg,nom-microvolt: Nominal actuator voltage rating. | ||
Valid values: 0 - 6000000. | ||
- dlg,abs-max-microvolt: Absolute actuator maximum voltage rating. | ||
Valid values: 0 - 6000000. | ||
- dlg,imax-microamp: Actuator max current rating. | ||
Valid values: 0 - 252000. | ||
Default: 130000. | ||
- dlg,impd-micro-ohms: the impedance of the actuator in micro ohms. | ||
Valid values: 0 - 1500000000. | ||
|
||
Optional properties: | ||
- pwms : phandle to the physical PWM(Pulse Width Modulation) device. | ||
PWM properties should be named "pwms". And number of cell is different | ||
for each pwm device. | ||
(See Documentation/devicetree/bindings/pwm/pwm.txt | ||
for further information relating to pwm properties) | ||
|
||
- dlg,ps-seq-id: the PS_SEQ_ID(pattern ID in waveform memory inside chip) | ||
to play back when RTWM-MODE is enabled. | ||
Valid range: 0 - 15. | ||
- dlg,ps-seq-loop: the PS_SEQ_LOOP, Number of times the pre-stored sequence | ||
pointed to by PS_SEQ_ID or GPI(N)_SEQUENCE_ID is repeated. | ||
Valid range: 0 - 15. | ||
- dlg,gpiN-seq-id: the GPI(N)_SEQUENCE_ID, pattern to play | ||
when gpi0 is triggered, 'N' must be 0 - 2. | ||
Valid range: 0 - 15. | ||
- dlg,gpiN-mode: the pattern mode which can select either | ||
"Single-pattern" or "Multi-pattern", 'N' must be 0 - 2. | ||
- dlg,gpiN-polarity: gpiN polarity which can be chosen among | ||
"Rising-edge", "Falling-edge" and "Both-edge", | ||
'N' must be 0 - 2 | ||
Haptic will work by this edge option in case of ETWM mode. | ||
|
||
- dlg,resonant-freq-hz: use in case of LRA. | ||
the frequency range: 50 - 300. | ||
Default: 205. | ||
|
||
- dlg,bemf-sens-enable: Enable for internal loop computations. | ||
- dlg,freq-track-enable: Enable for resonant frequency tracking. | ||
- dlg,acc-enable: Enable for active acceleration. | ||
- dlg,rapid-stop-enable: Enable for rapid stop. | ||
- dlg,amp-pid-enable: Enable for the amplitude PID. | ||
- dlg,mem-array: Customized waveform memory(patterns) data downloaded to | ||
the device during initialization. This is an array of 100 values(u8). | ||
|
||
For further information, see device datasheet. | ||
|
||
====== | ||
|
||
Example: | ||
|
||
haptics: da7280-haptics@4a { | ||
compatible = "dlg,da7280"; | ||
reg = <0x4a>; | ||
interrupt-parent = <&gpio6>; | ||
interrupts = <11 IRQ_TYPE_LEVEL_LOW>; | ||
dlg,actuator-type = "LRA"; | ||
dlg,dlg,const-op-mode = <1>; | ||
dlg,dlg,periodic-op-mode = <1>; | ||
dlg,nom-microvolt = <2000000>; | ||
dlg,abs-max-microvolt = <2000000>; | ||
dlg,imax-microamp = <170000>; | ||
dlg,resonant-freq-hz = <180>; | ||
dlg,impd-micro-ohms = <10500000>; | ||
dlg,freq-track-enable; | ||
dlg,rapid-stop-enable; | ||
dlg,mem-array = < | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
>; | ||
}; |
Oops, something went wrong.