diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-27 12:16:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-27 12:16:53 -0400 |
commit | c92067ae06cb71561628d9f4b24b56c1813c54e0 (patch) | |
tree | 775d6d419057de760b25dc8773cacbf65d567514 /Documentation | |
parent | 896a349228c494aa65279ccfc41d2395898f6f4d (diff) | |
parent | 03ae3a9caf4a59edd32b65c89c375a98ce3ea1ef (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
- the main change is a fix for my brain-dead patch to PS/2 button
reporting for some protocols that made it in 4.17
- there is a new driver for Spreadtum vibrator that I intended to send
during merge window but ended up not sending the 2nd pull request.
Given that this is a brand new driver we should not see regressions
here
- a fixup to Elantech PS/2 driver to avoid decoding errors on Thinkpad
P52
- addition of few more ACPI IDs for Silead and Elan drivers
- RMI4 is switched to using IRQ domain code instead of rolling its own
implementation
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: psmouse - fix button reporting for basic protocols
Input: xpad - fix GPD Win 2 controller name
Input: elan_i2c_smbus - fix more potential stack buffer overflows
Input: elan_i2c - add ELAN0618 (Lenovo v330 15IKB) ACPI ID
Input: elantech - fix V4 report decoding for module with middle key
Input: elantech - enable middle button of touchpads on ThinkPad P52
Input: do not assign new tracking ID when changing tool type
Input: make input_report_slot_state() return boolean
Input: synaptics-rmi4 - fix axis-swap behavior
Input: synaptics-rmi4 - fix the error return code in rmi_probe_interrupts()
Input: synaptics-rmi4 - convert irq distribution to irq_domain
Input: silead - add MSSL0002 ACPI HID
Input: goldfish_events - fix checkpatch warnings
Input: add Spreadtrum vibrator driver
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt b/Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt new file mode 100644 index 000000000000..f2ec0d4f2dff --- /dev/null +++ b/Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt | |||
@@ -0,0 +1,23 @@ | |||
1 | Spreadtrum SC27xx PMIC Vibrator | ||
2 | |||
3 | Required properties: | ||
4 | - compatible: should be "sprd,sc2731-vibrator". | ||
5 | - reg: address of vibrator control register. | ||
6 | |||
7 | Example : | ||
8 | |||
9 | sc2731_pmic: pmic@0 { | ||
10 | compatible = "sprd,sc2731"; | ||
11 | reg = <0>; | ||
12 | spi-max-frequency = <26000000>; | ||
13 | interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; | ||
14 | interrupt-controller; | ||
15 | #interrupt-cells = <2>; | ||
16 | #address-cells = <1>; | ||
17 | #size-cells = <0>; | ||
18 | |||
19 | vibrator@eb4 { | ||
20 | compatible = "sprd,sc2731-vibrator"; | ||
21 | reg = <0xeb4>; | ||
22 | }; | ||
23 | }; | ||