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

Commit c610b0cb authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

gpio: rcar: Add Runtime PM handling for interrupts 



commit b26a719bdba9aa926ceaadecc66e07623d2b8a53 upstream.

The R-Car GPIO driver handles Runtime PM for requested GPIOs only.

When using a GPIO purely as an interrupt source, no Runtime PM handling
is done, and the GPIO module's clock may not be enabled.

To fix this:
  - Add .irq_request_resources() and .irq_release_resources() callbacks
    to handle Runtime PM when an interrupt is requested,
  - Add irq_bus_lock() and sync_unlock() callbacks to handle Runtime PM
    when e.g. disabling/enabling an interrupt, or configuring the
    interrupt type.

Fixes: d5c3d84657db57bd "net: phy: Avoid polling PHY with PHY_IGNORE_INTERRUPTS"
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
[fabrizio: cherry-pick to v4.4.y. Use container_of instead of
gpiochip_get_data.]
Signed-off-by: default avatarFabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: default avatarBiju Das <biju.das@bp.renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09f7ebaa

drivers/gpio/gpio-rcar.c

+46 −0
Original line number Diff line number Diff line
@@ -200,6 +200,48 @@ 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 = container_of(gc, struct gpio_rcar_priv,

						gpio_chip);



	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 = container_of(gc, struct gpio_rcar_priv,

						gpio_chip);



	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 = container_of(gc, struct gpio_rcar_priv,

						gpio_chip);

	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 = container_of(gc, struct gpio_rcar_priv,

						gpio_chip);



	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;
@@ -460,6 +502,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(gpio_chip);