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

Commit 57ef0428 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: switch drivers to use new callback 



This switches all GPIO and pin control drivers with irqchips
that were using .startup() and .shutdown() callbacks to lock
GPIO lines for IRQ usage over to using the .request_resources()
and .release_resources() callbacks just introduced into the
irqchip vtable.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jean-Jacques Hiblot <jjhiblot@traphandler.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1d4a2166

drivers/gpio/gpio-adnp.c

+7 −8
Original line number Diff line number Diff line
@@ -408,24 +408,23 @@ static void adnp_irq_bus_unlock(struct irq_data *data) 
	mutex_unlock(&adnp->irq_lock);

}



static unsigned int adnp_irq_startup(struct irq_data *data)

static int adnp_irq_reqres(struct irq_data *data)

{

	struct adnp *adnp = irq_data_get_irq_chip_data(data);



	if (gpio_lock_as_irq(&adnp->gpio, data->hwirq))

	if (gpio_lock_as_irq(&adnp->gpio, data->hwirq)) {

		dev_err(adnp->gpio.dev,

			"unable to lock HW IRQ %lu for IRQ\n",

			data->hwirq);

	/* Satisfy the .enable semantics by unmasking the line */

	adnp_irq_unmask(data);

		return -EINVAL;

	}

	return 0;

}



static void adnp_irq_shutdown(struct irq_data *data)

static void adnp_irq_relres(struct irq_data *data)

{

	struct adnp *adnp = irq_data_get_irq_chip_data(data);



	adnp_irq_mask(data);

	gpio_unlock_as_irq(&adnp->gpio, data->hwirq);

}
@@ -436,8 +435,8 @@ static struct irq_chip adnp_irq_chip = { 
	.irq_set_type = adnp_irq_set_type,

	.irq_bus_lock = adnp_irq_bus_lock,

	.irq_bus_sync_unlock = adnp_irq_bus_unlock,

	.irq_startup = adnp_irq_startup,

	.irq_shutdown = adnp_irq_shutdown,

	.irq_request_resources = adnp_irq_reqres,

	.irq_release_resources = adnp_irq_relres,

};



static int adnp_irq_map(struct irq_domain *domain, unsigned int irq,

drivers/gpio/gpio-bcm-kona.c

+7 −7
Original line number Diff line number Diff line
@@ -466,23 +466,23 @@ static void bcm_kona_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) 
	chained_irq_exit(chip, desc);

}



static unsigned int bcm_kona_gpio_irq_startup(struct irq_data *d)

static int bcm_kona_gpio_irq_reqres(struct irq_data *d)

{

	struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);



	if (gpio_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq))

	if (gpio_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq)) {

		dev_err(kona_gpio->gpio_chip.dev,

			"unable to lock HW IRQ %lu for IRQ\n",

			d->hwirq);

	bcm_kona_gpio_irq_unmask(d);

		return -EINVAL;

	}

	return 0;

}



static void bcm_kona_gpio_irq_shutdown(struct irq_data *d)

static void bcm_kona_gpio_irq_relres(struct irq_data *d)

{

	struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);



	bcm_kona_gpio_irq_mask(d);

	gpio_unlock_as_irq(&kona_gpio->gpio_chip, d->hwirq);

}
@@ -492,8 +492,8 @@ static struct irq_chip bcm_gpio_irq_chip = { 
	.irq_mask = bcm_kona_gpio_irq_mask,

	.irq_unmask = bcm_kona_gpio_irq_unmask,

	.irq_set_type = bcm_kona_gpio_irq_set_type,

	.irq_startup = bcm_kona_gpio_irq_startup,

	.irq_shutdown = bcm_kona_gpio_irq_shutdown,

	.irq_request_resources = bcm_kona_gpio_irq_reqres,

	.irq_release_resources = bcm_kona_gpio_irq_relres,

};



static struct __initconst of_device_id bcm_kona_gpio_of_match[] = {

drivers/gpio/gpio-dwapb.c

+7 −7
Original line number Diff line number Diff line
@@ -136,26 +136,26 @@ static void dwapb_irq_disable(struct irq_data *d) 
	spin_unlock_irqrestore(&bgc->lock, flags);

}



static unsigned int dwapb_irq_startup(struct irq_data *d)

static int dwapb_irq_reqres(struct irq_data *d)

{

	struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);

	struct dwapb_gpio *gpio = igc->private;

	struct bgpio_chip *bgc = &gpio->ports[0].bgc;



	if (gpio_lock_as_irq(&bgc->gc, irqd_to_hwirq(d)))

	if (gpio_lock_as_irq(&bgc->gc, irqd_to_hwirq(d))) {

		dev_err(gpio->dev, "unable to lock HW IRQ %lu for IRQ\n",

			irqd_to_hwirq(d));

	dwapb_irq_enable(d);

		return -EINVAL;

	}

	return 0;

}



static void dwapb_irq_shutdown(struct irq_data *d)

static void dwapb_irq_relres(struct irq_data *d)

{

	struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);

	struct dwapb_gpio *gpio = igc->private;

	struct bgpio_chip *bgc = &gpio->ports[0].bgc;



	dwapb_irq_disable(d);

	gpio_unlock_as_irq(&bgc->gc, irqd_to_hwirq(d));

}
@@ -255,8 +255,8 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio, 
	ct->chip.irq_set_type = dwapb_irq_set_type;

	ct->chip.irq_enable = dwapb_irq_enable;

	ct->chip.irq_disable = dwapb_irq_disable;

	ct->chip.irq_startup = dwapb_irq_startup;

	ct->chip.irq_shutdown = dwapb_irq_shutdown;

	ct->chip.irq_request_resources = dwapb_irq_reqres;

	ct->chip.irq_release_resources = dwapb_irq_relres;

	ct->regs.ack = GPIO_PORTA_EOI;

	ct->regs.mask = GPIO_INTMASK;

drivers/gpio/gpio-em.c

+7 −7
Original line number Diff line number Diff line
@@ -99,23 +99,23 @@ static void em_gio_irq_enable(struct irq_data *d) 
	em_gio_write(p, GIO_IEN, BIT(irqd_to_hwirq(d)));

}



static unsigned int em_gio_irq_startup(struct irq_data *d)

static int em_gio_irq_reqres(struct irq_data *d)

{

	struct em_gio_priv *p = irq_data_get_irq_chip_data(d);



	if (gpio_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d)))

	if (gpio_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d))) {

		dev_err(p->gpio_chip.dev,

			"unable to lock HW IRQ %lu for IRQ\n",

			irqd_to_hwirq(d));

	em_gio_irq_enable(d);

		return -EINVAL;

	}

	return 0;

}



static void em_gio_irq_shutdown(struct irq_data *d)

static void em_gio_irq_relres(struct irq_data *d)

{

	struct em_gio_priv *p = irq_data_get_irq_chip_data(d);



	em_gio_irq_disable(d);

	gpio_unlock_as_irq(&p->gpio_chip, irqd_to_hwirq(d));

}
@@ -359,8 +359,8 @@ static int em_gio_probe(struct platform_device *pdev) 
	irq_chip->irq_mask = em_gio_irq_disable;

	irq_chip->irq_unmask = em_gio_irq_enable;

	irq_chip->irq_set_type = em_gio_irq_set_type;

	irq_chip->irq_startup = em_gio_irq_startup;

	irq_chip->irq_shutdown = em_gio_irq_shutdown;

	irq_chip->irq_request_resources = em_gio_irq_reqres;

	irq_chip->irq_release_resources = em_gio_irq_relres;

	irq_chip->flags	= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;



	p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,

drivers/gpio/gpio-intel-mid.c

+7 −7
Original line number Diff line number Diff line
@@ -231,23 +231,23 @@ static void intel_mid_irq_mask(struct irq_data *d) 
{

}



static unsigned int intel_mid_irq_startup(struct irq_data *d)

static int intel_mid_irq_reqres(struct irq_data *d)

{

	struct intel_mid_gpio *priv = irq_data_get_irq_chip_data(d);



	if (gpio_lock_as_irq(&priv->chip, irqd_to_hwirq(d)))

	if (gpio_lock_as_irq(&priv->chip, irqd_to_hwirq(d))) {

		dev_err(priv->chip.dev,

			"unable to lock HW IRQ %lu for IRQ\n",

			irqd_to_hwirq(d));

	intel_mid_irq_unmask(d);

		return -EINVAL;

	}

	return 0;

}



static void intel_mid_irq_shutdown(struct irq_data *d)

static void intel_mid_irq_relres(struct irq_data *d)

{

	struct intel_mid_gpio *priv = irq_data_get_irq_chip_data(d);



	intel_mid_irq_mask(d);

	gpio_unlock_as_irq(&priv->chip, irqd_to_hwirq(d));

}
@@ -256,8 +256,8 @@ static struct irq_chip intel_mid_irqchip = { 
	.irq_mask	= intel_mid_irq_mask,

	.irq_unmask	= intel_mid_irq_unmask,

	.irq_set_type	= intel_mid_irq_type,

	.irq_startup	= intel_mid_irq_startup,

	.irq_shutdown	= intel_mid_irq_shutdown,

	.irq_request_resources = intel_mid_irq_reqres,

	.irq_release_resources = intel_mid_irq_relres,

};



static const struct intel_mid_gpio_ddata gpio_lincroft = {