input: goodix - support Goodix gt5688
Subsystems (5)
v3 cover input: goodix - support Goodix gt5688
Besides the support for gt5688 two more minimal changes piled up so I'm folding these in here. One is a doc update for the goodix bindings, the other one makes it a bit simpler to figure out configuration problems (like lack of touchscreen-size-{x,y} in the device tree.
I've kept the original subject to (hopefully) not break the series for patchwork. All patches can be applied independently. Series is based on next-20190208.
Changes from v2
* Add 'dt-bindings: input: Refer to touchscreen.txt for goodix ts'
* Add 'input: goodix: Print values in case of inconsistencies' (sent out separtely before, no comments so far)
* Collect 'Reviewed-By' on 'input: goodix - support Goodix gt5688'
Changes from v1
* Add tested board to commit message
Guido Günther (3):
input: goodix - support Goodix gt5688
dt-bindings: input: Refer to touchscreen.txt for goodix ts
input: goodix: Print values in case of inconsistencies
.../bindings/input/touchscreen/goodix.txt | 14 +++++++++----- drivers/input/touchscreen/goodix.c | 6 +++++- 2 files changed, 14 insertions(+), 6 deletions(-)
Signature · 1 line
2.20.1
PATCH v3 1/3 input: goodix - support Goodix gt5688
Quoted 1 line
From what I've seen in vendor trees it's fine to treat this as gt1x¹.
Tested on the Purism Librem 5 Devkit (Rocktech JH057N00900 panel).
--- Documentation/devicetree/bindings/input/touchscreen/goodix.txt | 1 + drivers/input/touchscreen/goodix.c | 2 ++ 2 files changed, 3 insertions(+)
Documentation/devicetree/bindings/input/touchscreen/goodix.txt +1 -0
@@ -3,6 +3,7 @@ Device tree bindings for Goodix GT9xx series touchscreen controller Required properties: - compatible : Should be "goodix,gt1151" + or "goodix,gt5688" or "goodix,gt911" or "goodix,gt9110" or "goodix,gt912"
drivers/input/touchscreen/goodix.c +2 -0
@@ -216,6 +216,7 @@ static const struct goodix_chip_data *goodix_get_chip_data(u16 id) {switch (id) {case 1151 : +case 5688 :return >1x_chip_data;case 911 :
@@ -942,6 +943,7 @@ MODULE_DEVICE_TABLE(acpi, goodix_acpi_match);#ifdef CONFIG_OF static const struct of_device_id goodix_of_match[] = { { .compatible ="goodix,gt1151" }, + { .compatible ="goodix,gt5688" }, { .compatible ="goodix,gt911" }, { .compatible ="goodix,gt9110" }, { .compatible = "goodix,gt912" },
Signature · 1 line
2.20.1
PATCH v3 2/3 dt-bindings: input: Refer to touchscreen.txt for goodix ts
In reply to Guido GüntherRefer to touchscreen.txt for generic touch properties. This avoids duplication and we're using the generic code to parse these in the driver. While at that add touchscreen-size-{x,y} which are respected by the driver as well.
--- .../bindings/input/touchscreen/goodix.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/input/touchscreen/goodix.txt +8 -5
@@ -19,11 +19,14 @@ Optional properties: - irq-gpios : GPIO pin used for IRQ. The driver uses the interrupt gpio pin as output to reset the device. - reset-gpios : GPIO pin used for reset - - - touchscreen-inverted-x : X axis is inverted (boolean) - - touchscreen-inverted-y : Y axis is inverted (boolean) - - touchscreen-swapped-x-y : X and Y axis are swapped (boolean) - (swapping is done after inverting the axis) + - touchscreen-inverted-x + - touchscreen-inverted-y + - touchscreen-size-x + - touchscreen-size-y + - touchscreen-swapped-x-y + +The touchscreen-* properties are documented in touchscreen.txt in this +directory. Example:
Signature · 1 line
2.20.1
PATCH v3 3/3 input: goodix: Print values in case of inconsistencies
In reply to Guido Günther"Invalid config" gives little idea what's wrong. Print the values that must not be 0 so we know which ones are off.
--- drivers/input/touchscreen/goodix.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/input/touchscreen/goodix.c +3 -1
@@ -693,7 +693,9 @@ static int goodix_configure_dev(struct goodix_ts_data *ts)touchscreen_parse_properties (ts->input_dev, true, &ts->prop);if (!ts->prop.max_x || !ts->prop.max_y || !ts->max_touch_num) { -dev_err (&ts->client->dev,"Invalid config, using defaults\n" ); +dev_err (&ts->client->dev, +"Invalid config (%d, %d, %d), using defaults\n" , + ts->prop.max_x, ts->prop.max_y, ts->max_touch_num); ts->prop.max_x =GOODIX_MAX_WIDTH -1 ; ts->prop.max_y =GOODIX_MAX_HEIGHT -1 ; ts->max_touch_num =GOODIX_MAX_CONTACTS ;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Dmitry Torokhov
maintainerQuoted 9 lines · Guido Günther
Besides the support for gt5688 two more minimal changes piled up so I'm folding these in here. One is a doc update for the goodix bindings, the other one makes it a bit simpler to figure out configuration problems (like lack of touchscreen-size-{x,y} in the device tree.
I've kept the original subject to (hopefully) not break the series for patchwork. All patches can be applied independently. Series is based on next-20190208.
Quoted 5 lines
Changes from v2
* Add 'dt-bindings: input: Refer to touchscreen.txt for goodix ts'
* Add 'input: goodix: Print values in case of inconsistencies' (sent out separtely before, no comments so far)
* Collect 'Reviewed-By' on 'input: goodix - support Goodix gt5688'
Applied the lot, thank you.
Signature · 1 line
Dmitry