| From b6426287c1c586389ac4966e74ccab4fc04a29ed Mon Sep 17 00:00:00 2001 |
| From: Hans de Goede <hdegoede@redhat.com> |
| Date: Wed, 6 Nov 2019 12:51:09 +0100 |
| Subject: [PATCH] gpiolib: acpi: Add Terra Pad 1061 to the |
| run_edge_events_on_boot_blacklist |
| |
| commit 2727315df3f5ffbebcb174eed3153944a858b66f upstream. |
| |
| The Terra Pad 1061 has the usual micro-USB-B id-pin handler, but instead |
| of controlling the actual micro-USB-B it turns the 5V boost for the |
| tablet's USB-A connector and its keyboard-cover connector off. |
| |
| The actual micro-USB-B connector on the tablet is wired for charging only, |
| and its id pin is *not* connected to the GPIO which is used for the |
| (broken) id-pin event handler in the DSDT. |
| |
| While at it not only add a comment why the Terra Pad 1061 is on the |
| blacklist, but also fix the missing comment for the Minix Neo Z83-4 entry. |
| |
| Fixes: 61f7f7c8f978 ("gpiolib: acpi: Add gpiolib_acpi_run_edge_events_on_boot option and blacklist") |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c |
| index 4d5c285c46f8..4cbe32962815 100644 |
| --- a/drivers/gpio/gpiolib-acpi.c |
| +++ b/drivers/gpio/gpiolib-acpi.c |
| @@ -1295,11 +1295,28 @@ late_initcall_sync(acpi_gpio_handle_deferred_request_irqs); |
| |
| static const struct dmi_system_id run_edge_events_on_boot_blacklist[] = { |
| { |
| + /* |
| + * The Minix Neo Z83-4 has a micro-USB-B id-pin handler for |
| + * a non existing micro-USB-B connector which puts the HDMI |
| + * DDC pins in GPIO mode, breaking HDMI support. |
| + */ |
| .matches = { |
| DMI_MATCH(DMI_SYS_VENDOR, "MINIX"), |
| DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"), |
| } |
| }, |
| + { |
| + /* |
| + * The Terra Pad 1061 has a micro-USB-B id-pin handler, which |
| + * instead of controlling the actual micro-USB-B turns the 5V |
| + * boost for its USB-A connector off. The actual micro-USB-B |
| + * connector is wired for charging only. |
| + */ |
| + .matches = { |
| + DMI_MATCH(DMI_SYS_VENDOR, "Wortmann_AG"), |
| + DMI_MATCH(DMI_PRODUCT_NAME, "TERRA_PAD_1061"), |
| + } |
| + }, |
| {} /* Terminating entry */ |
| }; |
| |
| -- |
| 2.7.4 |
| |