github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 10:04:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

gpio fixes for v6.18-rc1

Browse Source 
- 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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmjpB2IACgkQEacuoBRx
 13IalxAAy+nX8AABUTmkSEInIlUyMdyFgOGoKS5ShwWIZlPHrdmlM5JT11xkkYjn
 W+uoeaVIf/x8NIdX9s0NhnQa7zLGEvtT0nddGlyEoQo/LEOGYoXzJ2t9HnGpg18b
 kTHXwXzmKK5mxs32cAXQRf7KtWhnsioT+/cYoY1uKDBW2tFwb14nB7CUbzYM7kas
 oqzlWOuGQYm6XFYD5PLA+ViASj4jZOc/G548HmChL8dIYszHV8FnA/BTKwcJyfxv
 ra2G+3/u4F/IZWg1JONLxJfQ3NkwZamJFUcFgQVT46UQpDaOT2fXGKy836LyKb86
 Wp2yiVj18BQ6d7wqCMuM1NZWj2tUNo2KXigpCEAw/EJ9Ol3nQZk556yycCFscezE
 9Z5HCVtvhi+UHH9+O11FvyKgNfc8YxUzQ3LslTOqW5hAuYRNOYh8+19Sw4IZNuxA
 /PXHg3Vsvd8YfLNk9ABFabVIgaSqULIuVhGyBBFF4u5ISCSNmEDP2LMV8ZaVqVBX
 dE5c5GlLiwrNnwa0HW1NeazTIULbfw0x4tFBvubicv6vfcvYL3CzJvkmfEZqHusf
 Q6ymsc6INKDtv/Fc7JjyxcLNl/ySjiUhedH7G1h8EKjhH/pFoZrW1GTn3Yvn19O0
 JvkjnYBn6qoZAi+IpcfWvomYInffLcVh5l+OwJCL6TEi4SWVAIA=
 =v17p
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-10-10 09:22:39 -07:00
commit 9976831f40
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpio/gpio-usbio.c
View File

@ -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 */
{ }
};

2
drivers/gpio/gpio-wcd934x.c
View File

@ -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);
}