Skip to content

Commit aef511f

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: - three new touchscreen drivers: Hycon HY46XX, ILITEK Lego Series, and MStar MSG2638 - a new driver for Azoteq IQS626A proximity and touch controller - addition of Amazon Game Controller to the list of devices handled by the xpad driver - Elan touchscreen driver will avoid binding to devices described as I2CHID compatible in ACPI tables - various driver fixes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (56 commits) Input: xpad - add support for Amazon Game Controller Input: ili210x - add missing negation for touch indication on ili210x MAINTAINERS: repair reference in HYCON HY46XX TOUCHSCREEN SUPPORT Input: add driver for the Hycon HY46XX touchpanel series dt-bindings: touchscreen: Add HY46XX bindings dt-bindings: Add Hycon Technology vendor prefix Input: cyttsp - flag the device properly Input: cyttsp - set abs params for ABS_MT_TOUCH_MAJOR Input: cyttsp - drop the phys path Input: cyttsp - reduce reset pulse timings Input: cyttsp - error message on boot mode exit error Input: apbps2 - remove useless variable Input: mms114 - support MMS136 Input: mms114 - convert bindings to YAML and extend Input: Add support for ILITEK Lego Series dt-bindings: input: touchscreen: ilitek_ts_i2c: Add bindings Input: add MStar MSG2638 touchscreen driver dt-bindings: input/touchscreen: add bindings for msg2638 Input: silead - add workaround for x86 BIOS-es which bring the chip up in a stuck state Input: elants_i2c - do not bind to i2c-hid compatible ACPI instantiated devices ...
2 parents e486612 + 05665ce commit aef511f

Some content is hidden

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

53 files changed

+5469
-537
lines changed

Documentation/ABI/testing/sysfs-driver-input-exc3000

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,12 @@ Description: Reports the model identification provided by the touchscreen, fo
1515
Access: Read
1616

1717
Valid values: Represented as string
18+
19+
What: /sys/bus/i2c/devices/xxx/type
20+
Date: Jan 2021
21+
22+
Description: Reports the type identification provided by the touchscreen, for example "PCAP82H80 Series"
23+
24+
Access: Read
25+
26+
Valid values: Represented as string

Documentation/devicetree/bindings/input/atmel,maxtouch.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ properties:
3939
(active low). The line must be flagged with
4040
GPIO_ACTIVE_LOW.
4141

42+
wake-gpios:
43+
maxItems: 1
44+
description:
45+
Optional GPIO specifier for the touchscreen's wake pin
46+
(active low). The line must be flagged with
47+
GPIO_ACTIVE_LOW.
48+
4249
linux,gpio-keymap:
4350
$ref: /schemas/types.yaml#/definitions/uint32-array
4451
description: |
@@ -53,6 +60,29 @@ properties:
5360
or experiment to determine which bit corresponds to which input. Use
5461
KEY_RESERVED for unused padding values.
5562
63+
atmel,wakeup-method:
64+
$ref: /schemas/types.yaml#/definitions/uint32
65+
description: |
66+
The WAKE line is an active-low input that is used to wake up the touch
67+
controller from deep-sleep mode before communication with the controller
68+
could be started. This optional feature used to minimize current
69+
consumption when the controller is in deep sleep mode. This feature is
70+
relevant only to some controller families, like mXT1386 controller for
71+
example.
72+
73+
The WAKE pin can be connected in one of the following ways:
74+
1) left permanently low
75+
2) connected to the I2C-compatible SCL pin
76+
3) connected to a GPIO pin on the host
77+
enum:
78+
- 0 # ATMEL_MXT_WAKEUP_NONE
79+
- 1 # ATMEL_MXT_WAKEUP_I2C_SCL
80+
- 2 # ATMEL_MXT_WAKEUP_GPIO
81+
default: 0
82+
83+
wakeup-source:
84+
type: boolean
85+
5686
required:
5787
- compatible
5888
- reg
@@ -63,6 +93,7 @@ additionalProperties: false
6393
examples:
6494
- |
6595
#include <dt-bindings/interrupt-controller/irq.h>
96+
#include <dt-bindings/input/atmel-maxtouch.h>
6697
#include <dt-bindings/gpio/gpio.h>
6798
i2c {
6899
#address-cells = <1>;
@@ -75,6 +106,7 @@ examples:
75106
reset-gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
76107
vdda-supply = <&ab8500_ldo_aux2_reg>;
77108
vdd-supply = <&ab8500_ldo_aux5_reg>;
109+
atmel,wakeup-method = <ATMEL_MXT_WAKEUP_I2C_SCL>;
78110
};
79111
};
80112

0 commit comments

Comments
 (0)