leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Ray Jui <rjui@broadcom.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Hans Verkuil 2018-09-08 11:23:19 +02:00 committed by Linus Walleij
parent 4f8183ae70
commit 1c939cb556
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpio/gpio-bcm-kona.c
View File

@ -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 = readl(reg_base + GPIO_INT_MASK(bank_id));
val |= BIT(bit); val |= BIT(bit);
writel(val, reg_base + GPIO_INT_MASK(bank_id)); 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); 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 = readl(reg_base + GPIO_INT_MSKCLR(bank_id));
val |= BIT(bit); val |= BIT(bit);
writel(val, reg_base + GPIO_INT_MSKCLR(bank_id)); 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); 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) static int bcm_kona_gpio_irq_reqres(struct irq_data *d)
{ {
struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_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); return gpiochip_reqres_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;
} }
static void bcm_kona_gpio_irq_relres(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); 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 = { static struct irq_chip bcm_gpio_irq_chip = {