Skip to content

Commit 16c0734

Browse files
superm1andy-shev
authored andcommitted
gpiolib: acpi: Program debounce when finding GPIO
When soc-button-array looks up the GPIO to use it calls acpi_find_gpio() which will parse _CRS. acpi_find_gpio.cold (drivers/gpio/gpiolib-acpi-core.c:953) gpiod_find_and_request (drivers/gpio/gpiolib.c:4598 drivers/gpio/gpiolib.c:4625) gpiod_get_index (drivers/gpio/gpiolib.c:4877) The GPIO is setup basically, but the debounce information is discarded. The platform will assert what debounce should be in _CRS, so program it at the time it's available. Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent 8f5ae30 commit 16c0734

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

drivers/gpio/gpiolib-acpi-core.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,7 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,
944944
bool can_fallback = acpi_can_fallback_to_crs(adev, con_id);
945945
struct acpi_gpio_info info;
946946
struct gpio_desc *desc;
947+
int ret;
947948

948949
desc = __acpi_find_gpio(fwnode, con_id, idx, can_fallback, &info);
949950
if (IS_ERR(desc))
@@ -957,6 +958,12 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,
957958

958959
acpi_gpio_update_gpiod_flags(dflags, &info);
959960
acpi_gpio_update_gpiod_lookup_flags(lookupflags, &info);
961+
962+
/* ACPI uses hundredths of milliseconds units */
963+
ret = gpio_set_debounce_timeout(desc, info.debounce * 10);
964+
if (ret)
965+
return ERR_PTR(ret);
966+
960967
return desc;
961968
}
962969

0 commit comments

Comments
 (0)