In commit a2fd46cd3dbb ("Input: goodix - try not to touch the reset-pin on x86/ACPI devices")
a fix for problems on various x86/ACPI devices where external
pull-up is missing were added. The same type of problem can exist on
device-tree platforms, and the fix can be activated by adding the
no-reset-pull-up device-tree property.
Signed-off-by: Esben Haabendal <esben@geanix.com>
---
drivers/input/touchscreen/goodix.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index a3e8a51c91449533b4d5185746df6b98676053dd..3a55b0f8e5132a5e1fe77bd27de74e058a4afdaf 100644
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -775,7 +775,8 @@ int goodix_reset_no_int_sync(struct goodix_ts_data *ts)
* power. Only do this in the non ACPI case since some ACPI boards
* don't have a pull-up, so there the reset pin must stay active-high.
*/
- if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_GPIO) {
+ if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_GPIO &&
+ ts->gpiod_rst_flags == GPIOD_IN) {
error = gpiod_direction_input(ts->gpiod_rst);
if (error)
goto error;
@@ -969,6 +970,13 @@ static int goodix_get_gpio_config(struct goodix_ts_data *ts)
*/
ts->gpiod_rst_flags = GPIOD_IN;
+ /*
+ * Devices that does not have pull-up on reset signal should not be
+ * changed to input
+ */
+ if (device_property_read_bool(dev, "no-reset-pull-up"))
+ ts->gpiod_rst_flags = GPIOD_ASIS;
+
ts->avdd28 = devm_regulator_get(dev, "AVDD28");
if (IS_ERR(ts->avdd28))
return dev_err_probe(dev, PTR_ERR(ts->avdd28), "Failed to get AVDD28 regulator\n");
--
2.49.0
Hi,
On 22-Apr-25 17:15, Esben Haabendal wrote:
> In commit a2fd46cd3dbb ("Input: goodix - try not to touch the reset-pin on x86/ACPI devices")
> a fix for problems on various x86/ACPI devices where external
> pull-up is missing were added. The same type of problem can exist on
> device-tree platforms, and the fix can be activated by adding the
> no-reset-pull-up device-tree property.
>
> Signed-off-by: Esben Haabendal <esben@geanix.com>
Thank you for your patch.
> ---
> drivers/input/touchscreen/goodix.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
> index a3e8a51c91449533b4d5185746df6b98676053dd..3a55b0f8e5132a5e1fe77bd27de74e058a4afdaf 100644
> --- a/drivers/input/touchscreen/goodix.c
> +++ b/drivers/input/touchscreen/goodix.c
> @@ -775,7 +775,8 @@ int goodix_reset_no_int_sync(struct goodix_ts_data *ts)
> * power. Only do this in the non ACPI case since some ACPI boards
> * don't have a pull-up, so there the reset pin must stay active-high.
> */
> - if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_GPIO) {
> + if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_GPIO &&
> + ts->gpiod_rst_flags == GPIOD_IN) {
You can simplify the check to just:
if (ts->gpiod_rst_flags == GPIOD_IN) {
that will work for the IRQ_PIN_ACCESS_ACPI* access_methods too and
nicely lines up with the gpiod_direction_input() on the next line.
Please also update the comment above the check to reflect the new
situation.
With this fixed, this looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> error = gpiod_direction_input(ts->gpiod_rst);
> if (error)
> goto error;
> @@ -969,6 +970,13 @@ static int goodix_get_gpio_config(struct goodix_ts_data *ts)
> */
> ts->gpiod_rst_flags = GPIOD_IN;
>
> + /*
> + * Devices that does not have pull-up on reset signal should not be
> + * changed to input
> + */
> + if (device_property_read_bool(dev, "no-reset-pull-up"))
> + ts->gpiod_rst_flags = GPIOD_ASIS;
> +
> ts->avdd28 = devm_regulator_get(dev, "AVDD28");
> if (IS_ERR(ts->avdd28))
> return dev_err_probe(dev, PTR_ERR(ts->avdd28), "Failed to get AVDD28 regulator\n");
>
© 2016 - 2025 Red Hat, Inc.