Skip to content

Commit 7ca7cb2

Browse files
committed
Merge branch 'ili2xxx-touchscreen' into next
Bring in improvements to ili2xxx driver, including support for 2117A/2118A controllers.
2 parents 92d6d0a + a5fdf7d commit 7ca7cb2

File tree

2 files changed

+218
-163
lines changed

2 files changed

+218
-163
lines changed

Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
Ilitek ILI210x/ILI251x touchscreen controller
1+
Ilitek ILI210x/ILI2117/ILI251x touchscreen controller
22

33
Required properties:
44
- compatible:
55
ilitek,ili210x for ILI210x
6+
ilitek,ili2117 for ILI2117
67
ilitek,ili251x for ILI251x
78

89
- reg: The I2C address of the device

0 commit comments

Comments
 (0)