Skip to content

Commit 67abd9e

Browse files
jwrdegoededtor
authored andcommitted
Input: goodix - add support for getting IRQ + reset GPIOs on Bay Trail devices
On most Bay Trail (x86, UEFI + ACPI) devices the ACPI tables do not have a _DSD with a "daffd814-6eba-4d8c-8a91-bc9bbf4aa301" UUID, adding "irq-gpios" and "reset-gpios" mappings, so we cannot get the GPIOS by name without first manually adding mappings ourselves. These devices contain 2 GpioIo resource in their _CRS table, on all 4 such devices which I have access to, the order of the 2 GPIOs is reset, int. Note that the GPIO to which the touchscreen controller irq pin is connected is configured in direct-irq mode on these Bay Trail devices, the pinctrl-baytrail.c driver still allows controlling the pin as a GPIO in this case, but this is not necessarily the case on other X86 ACPI platforms, nor do we have a guarantee that the GPIO order is the same elsewhere, so we limit the use of a _CRS table with 2 GpioIo resources to Bay Trail devices only. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1786317 BugLink: nexus511/gpd-ubuntu-packages#10 BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=199207 Reviewed-by: Bastien Nocera <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent a7d4b17 commit 67abd9e

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

drivers/input/touchscreen/goodix.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,21 @@ static int goodix_reset(struct goodix_ts_data *ts)
626626
}
627627

628628
#if defined CONFIG_X86 && defined CONFIG_ACPI
629+
#include <asm/cpu_device_id.h>
630+
#include <asm/intel-family.h>
631+
632+
static const struct x86_cpu_id baytrail_cpu_ids[] = {
633+
{ X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT, X86_FEATURE_ANY, },
634+
{}
635+
};
636+
637+
static inline bool is_byt(void)
638+
{
639+
const struct x86_cpu_id *id = x86_match_cpu(baytrail_cpu_ids);
640+
641+
return !!id;
642+
}
643+
629644
static const struct acpi_gpio_params first_gpio = { 0, 0, false };
630645
static const struct acpi_gpio_params second_gpio = { 1, 0, false };
631646

@@ -698,6 +713,10 @@ static int goodix_add_acpi_gpio_mappings(struct goodix_ts_data *ts)
698713
} else if (ts->gpio_count == 2 && ts->gpio_int_idx == 1) {
699714
ts->irq_pin_access_method = IRQ_PIN_ACCESS_ACPI_GPIO;
700715
gpio_mapping = acpi_goodix_int_last_gpios;
716+
} else if (is_byt() && ts->gpio_count == 2 && ts->gpio_int_idx == -1) {
717+
dev_info(dev, "No ACPI GpioInt resource, assuming that the GPIO order is reset, int\n");
718+
ts->irq_pin_access_method = IRQ_PIN_ACCESS_ACPI_GPIO;
719+
gpio_mapping = acpi_goodix_int_last_gpios;
701720
} else {
702721
dev_warn(dev, "Unexpected ACPI resources: gpio_count %d, gpio_int_idx %d\n",
703722
ts->gpio_count, ts->gpio_int_idx);

0 commit comments

Comments
 (0)