Commit 71e58659 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - fix a potential spinlock deadlock in gpio-timberdale

 - mark the gpio-pmic-eic-sprd driver as one that can sleep

* tag 'gpio-fixes-for-v6.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip
  gpio: timberdale: Fix potential deadlock on &tgpio->lock
parents acfdcaee 26d9e564

drivers/gpio/gpio-pmic-eic-sprd.c

+1 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev) 
	pmic_eic->chip.set_config = sprd_pmic_eic_set_config;

	pmic_eic->chip.set = sprd_pmic_eic_set;

	pmic_eic->chip.get = sprd_pmic_eic_get;

	pmic_eic->chip.can_sleep = true;



	irq = &pmic_eic->chip.irq;

	gpio_irq_chip_set_chip(irq, &pmic_eic_irq_chip);

drivers/gpio/gpio-timberdale.c

+3 −2
Original line number Diff line number Diff line
@@ -43,9 +43,10 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index, 
	unsigned offset, bool enabled)

{

	struct timbgpio *tgpio = gpiochip_get_data(gpio);

	unsigned long flags;

	u32 reg;



	spin_lock(&tgpio->lock);

	spin_lock_irqsave(&tgpio->lock, flags);

	reg = ioread32(tgpio->membase + offset);



	if (enabled)
@@ -54,7 +55,7 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index, 
		reg &= ~(1 << index);



	iowrite32(reg, tgpio->membase + offset);

	spin_unlock(&tgpio->lock);

	spin_unlock_irqrestore(&tgpio->lock, flags);



	return 0;

}