Skip to content

Commit 0e3b175

Browse files
superm1Bartosz Golaszewski
authored andcommitted
gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI
Using the `ignore_wake` quirk or module parameter doesn't work for any pin that has been specified in the _CRS instead of _AEI. Extend the `acpi_gpio_irq_is_wake` check to cover both places. Suggested-by: Raul Rangel <rrangel@chromium.org> Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1722#note_1722335 Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
1 parent 8e88a0f commit 0e3b175

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpio/gpiolib-acpi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static bool acpi_gpio_in_ignore_list(const char *ignore_list, const char *contro
385385
}
386386

387387
static bool acpi_gpio_irq_is_wake(struct device *parent,
388-
struct acpi_resource_gpio *agpio)
388+
const struct acpi_resource_gpio *agpio)
389389
{
390390
unsigned int pin = agpio->pin_table[0];
391391

@@ -778,7 +778,7 @@ static int acpi_populate_gpio_lookup(struct acpi_resource *ares, void *data)
778778
lookup->info.pin_config = agpio->pin_config;
779779
lookup->info.debounce = agpio->debounce_timeout;
780780
lookup->info.gpioint = gpioint;
781-
lookup->info.wake_capable = agpio->wake_capable == ACPI_WAKE_CAPABLE;
781+
lookup->info.wake_capable = acpi_gpio_irq_is_wake(&lookup->info.adev->dev, agpio);
782782

783783
/*
784784
* Polarity and triggering are only specified for GpioInt

0 commit comments

Comments
 (0)