Merge branch 'ili2xxx-touchscreen' into next

Bring in improvements to ili2xxx driver, including support for 2117A/2118A controllers.

Merge branch 'ili2xxx-touchscreen' into next
Bring in improvements to ili2xxx driver, including support for 2117A/2118A controllers.
7ca7cb23 · Dmitry Torokhov · 92d6d0a1 · a5fdf7d0 · 7ca7cb23 · 7ca7cb23
Commit 7ca7cb23 authored Nov 11, 2019 by Dmitry Torokhov
Showing with 218 additions and 163 deletions

Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt +2 -1

drivers/input/touchscreen/ili210x.c drivers/input/touchscreen/ili210x.c +216 -162

No files found.
--- a/Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt
+++ b/Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt
-Ilitek ILI210x/ILI251x touchscreen controller
+Ilitek ILI210x/ILI2117/ILI251x touchscreen controller

 Required properties:
 - compatible:
    ilitek,ili210x for ILI210x
+    ilitek,ili2117 for ILI2117
    ilitek,ili251x for ILI251x

 - reg: The I2C address of the device

--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c