Commit 9976831f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents dcf50ca7 b5f8aa8d

drivers/gpio/gpio-usbio.c

+1 −0
Original line number Diff line number Diff line
@@ -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 */

	{ }

};

drivers/gpio/gpio-wcd934x.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}