Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4237b2e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v4.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull late GPIO fix from Linus Walleij:
 "Regressions never arrive when you want them to, so here is a late fix
  for the Renesas RCAR GPIO driver.  It only affects that driver on the
  very specific Renesas platforms:

   - Fix a runtime PM suspend/resume bug in the RCAR driver"

* tag 'gpio-v4.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: rcar: Add Runtime PM handling for interrupts
parents 19eab220 b26a719b

drivers/gpio/gpio-rcar.c

+42 −0
Original line number Diff line number Diff line
@@ -196,6 +196,44 @@ static int gpio_rcar_irq_set_wake(struct irq_data *d, unsigned int on) 
	return 0;

}



static void gpio_rcar_irq_bus_lock(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct gpio_rcar_priv *p = gpiochip_get_data(gc);



	pm_runtime_get_sync(&p->pdev->dev);

}



static void gpio_rcar_irq_bus_sync_unlock(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct gpio_rcar_priv *p = gpiochip_get_data(gc);



	pm_runtime_put(&p->pdev->dev);

}





static int gpio_rcar_irq_request_resources(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct gpio_rcar_priv *p = gpiochip_get_data(gc);

	int error;



	error = pm_runtime_get_sync(&p->pdev->dev);

	if (error < 0)

		return error;



	return 0;

}



static void gpio_rcar_irq_release_resources(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct gpio_rcar_priv *p = gpiochip_get_data(gc);



	pm_runtime_put(&p->pdev->dev);

}



static irqreturn_t gpio_rcar_irq_handler(int irq, void *dev_id)

{

	struct gpio_rcar_priv *p = dev_id;
@@ -450,6 +488,10 @@ static int gpio_rcar_probe(struct platform_device *pdev) 
	irq_chip->irq_unmask = gpio_rcar_irq_enable;

	irq_chip->irq_set_type = gpio_rcar_irq_set_type;

	irq_chip->irq_set_wake = gpio_rcar_irq_set_wake;

	irq_chip->irq_bus_lock = gpio_rcar_irq_bus_lock;

	irq_chip->irq_bus_sync_unlock = gpio_rcar_irq_bus_sync_unlock;

	irq_chip->irq_request_resources = gpio_rcar_irq_request_resources;

	irq_chip->irq_release_resources = gpio_rcar_irq_release_resources;

	irq_chip->flags	= IRQCHIP_SET_TYPE_MASKED | IRQCHIP_MASK_ON_SUSPEND;



	ret = gpiochip_add_data(gpio_chip, p);