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

Commit 1c939cb5 authored by Hans Verkuil's avatar Hans Verkuil Committed by Linus Walleij
Browse files

gpio-bcm-kona: use new req/relres and dis/enable_irq funcs 



Since this driver does not use the gpiolib irqchip helpers it will have to
allocate the irq resources and irq_en/disable itself.

Use the new gpiochip_req/relres_irq helpers to request/release all the
resources.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: Ray Jui <rjui@broadcom.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 4f8183ae

drivers/gpio/gpio-bcm-kona.c

+4 −10
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ static void bcm_kona_gpio_irq_mask(struct irq_data *d) 
	val = readl(reg_base + GPIO_INT_MASK(bank_id));

	val |= BIT(bit);

	writel(val, reg_base + GPIO_INT_MASK(bank_id));

	gpiochip_disable_irq(&kona_gpio->gpio_chip, gpio);



	raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);

}
@@ -394,6 +395,7 @@ static void bcm_kona_gpio_irq_unmask(struct irq_data *d) 
	val = readl(reg_base + GPIO_INT_MSKCLR(bank_id));

	val |= BIT(bit);

	writel(val, reg_base + GPIO_INT_MSKCLR(bank_id));

	gpiochip_enable_irq(&kona_gpio->gpio_chip, gpio);



	raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);

}
@@ -485,23 +487,15 @@ static void bcm_kona_gpio_irq_handler(struct irq_desc *desc) 
static int bcm_kona_gpio_irq_reqres(struct irq_data *d)

{

	struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);

	int ret;



	ret = gpiochip_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq);

	if (ret) {

		dev_err(kona_gpio->gpio_chip.parent,

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

			d->hwirq);

		return ret;

	}

	return 0;

	return gpiochip_reqres_irq(&kona_gpio->gpio_chip, d->hwirq);

}



static void bcm_kona_gpio_irq_relres(struct irq_data *d)

{

	struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);



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

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

}



static struct irq_chip bcm_gpio_irq_chip = {