diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-10 09:22:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-10 09:22:39 -0700 |
| commit | 9976831f401eeb302d699b2d37624153d7cd2892 (patch) | |
| tree | 3030bc1e70fdd6074b73ac1c44db0d3ef096f612 | |
| parent | Merge tag 'ntb-6.18' of https://github.com/jonmason/ntb (diff) | |
| parent | gpio: wcd934x: mark the GPIO controller as sleeping (diff) | |
| download | linux-9976831f401eeb302d699b2d37624153d7cd2892.tar.gz linux-9976831f401eeb302d699b2d37624153d7cd2892.zip | |
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
| -rw-r--r-- | drivers/gpio/gpio-usbio.c | 1 | ||||
| -rw-r--r-- | drivers/gpio/gpio-wcd934x.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-usbio.c b/drivers/gpio/gpio-usbio.c index e13c120824e3..34d42c743d5b 100644 --- a/drivers/gpio/gpio-usbio.c +++ b/drivers/gpio/gpio-usbio.c @@ -29,6 +29,7 @@ static const struct acpi_device_id usbio_gpio_acpi_hids[] = { { "INTC1007" }, /* MTL */ { "INTC10B2" }, /* ARL */ { "INTC10B5" }, /* LNL */ + { "INTC10D1" }, /* MTL-CVF */ { "INTC10E2" }, /* PTL */ { } }; diff --git a/drivers/gpio/gpio-wcd934x.c b/drivers/gpio/gpio-wcd934x.c index 4af504c23e6f..572b85e77370 100644 --- a/drivers/gpio/gpio-wcd934x.c +++ b/drivers/gpio/gpio-wcd934x.c @@ -103,7 +103,7 @@ static int wcd_gpio_probe(struct platform_device *pdev) chip->base = -1; chip->ngpio = WCD934X_NPINS; chip->label = dev_name(dev); - chip->can_sleep = false; + chip->can_sleep = true; return devm_gpiochip_add_data(dev, chip, data); } |