Skip to content

Commit 9976831

Browse files
committed
Merge tag 'gpio-fixes-for-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski: - add a missing ACPI ID for MTL-CVF devices in gpio-usbio - mark the gpio-wcd934x controller as "sleeping" as it uses a mutex for locking internally * tag 'gpio-fixes-for-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: wcd934x: mark the GPIO controller as sleeping gpio: usbio: Add ACPI device-id for MTL-CVF devices
2 parents dcf50ca + b5f8aa8 commit 9976831

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

drivers/gpio/gpio-usbio.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ static const struct acpi_device_id usbio_gpio_acpi_hids[] = {
2929
{ "INTC1007" }, /* MTL */
3030
{ "INTC10B2" }, /* ARL */
3131
{ "INTC10B5" }, /* LNL */
32+
{ "INTC10D1" }, /* MTL-CVF */
3233
{ "INTC10E2" }, /* PTL */
3334
{ }
3435
};

drivers/gpio/gpio-wcd934x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static int wcd_gpio_probe(struct platform_device *pdev)
103103
chip->base = -1;
104104
chip->ngpio = WCD934X_NPINS;
105105
chip->label = dev_name(dev);
106-
chip->can_sleep = false;
106+
chip->can_sleep = true;
107107

108108
return devm_gpiochip_add_data(dev, chip, data);
109109
}

0 commit comments

Comments
 (0)