Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-04 04:04:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gpio: rda: Convert to immutable irq_chip

Browse Source 
Convert the driver to immutable irq-chip with a bit of
intuition.

Cc: Marc Zyngier <maz@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Manivannan Sadhasivam <mani@kernel.org>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
This commit is contained in:
Linus Walleij 2023-03-20 10:55:08 +01:00 committed by Bartosz Golaszewski
parent 9bc167e27c
commit 957e64bee8
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpio/gpio-rda.c
View File

@ -38,7 +38,6 @@ struct rda_gpio {
struct gpio_chip chip; struct gpio_chip chip;
void __iomem *base; void __iomem *base;
spinlock_t lock; spinlock_t lock;
struct irq_chip irq_chip;
int irq; int irq;
}; };
@ -74,6 +73,7 @@ static void rda_gpio_irq_mask(struct irq_data *data)
value |= BIT(offset) << RDA_GPIO_IRQ_FALL_SHIFT; value |= BIT(offset) << RDA_GPIO_IRQ_FALL_SHIFT;
writel_relaxed(value, base + RDA_GPIO_INT_CTRL_CLR); writel_relaxed(value, base + RDA_GPIO_INT_CTRL_CLR);
gpiochip_disable_irq(chip, offset);
} }
static void rda_gpio_irq_ack(struct irq_data *data) static void rda_gpio_irq_ack(struct irq_data *data)
@ -154,6 +154,7 @@ static void rda_gpio_irq_unmask(struct irq_data *data)
u32 offset = irqd_to_hwirq(data); u32 offset = irqd_to_hwirq(data);
u32 trigger = irqd_get_trigger_type(data); u32 trigger = irqd_get_trigger_type(data);
gpiochip_enable_irq(chip, offset);
rda_gpio_set_irq(chip, offset, trigger); rda_gpio_set_irq(chip, offset, trigger);
} }
@ -195,6 +196,16 @@ static void rda_gpio_irq_handler(struct irq_desc *desc)
chained_irq_exit(ic, desc); chained_irq_exit(ic, desc);
} }
static const struct irq_chip rda_gpio_irq_chip = {
.name = "rda-gpio",
.irq_ack = rda_gpio_irq_ack,
.irq_mask = rda_gpio_irq_mask,
.irq_unmask = rda_gpio_irq_unmask,
.irq_set_type = rda_gpio_irq_set_type,
.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE,
GPIOCHIP_IRQ_RESOURCE_HELPERS,
};
static int rda_gpio_probe(struct platform_device *pdev) static int rda_gpio_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -241,15 +252,8 @@ static int rda_gpio_probe(struct platform_device *pdev)
rda_gpio->chip.base = -1; rda_gpio->chip.base = -1;
if (rda_gpio->irq >= 0) { if (rda_gpio->irq >= 0) {
rda_gpio->irq_chip.name = "rda-gpio",
rda_gpio->irq_chip.irq_ack = rda_gpio_irq_ack,
rda_gpio->irq_chip.irq_mask = rda_gpio_irq_mask,
rda_gpio->irq_chip.irq_unmask = rda_gpio_irq_unmask,
rda_gpio->irq_chip.irq_set_type = rda_gpio_irq_set_type,
rda_gpio->irq_chip.flags = IRQCHIP_SKIP_SET_WAKE,
girq = &rda_gpio->chip.irq; girq = &rda_gpio->chip.irq;
girq->chip = &rda_gpio->irq_chip; gpio_irq_chip_set_chip(girq, &rda_gpio_irq_chip);
girq->handler = handle_bad_irq; girq->handler = handle_bad_irq;
girq->default_type = IRQ_TYPE_NONE; girq->default_type = IRQ_TYPE_NONE;
girq->parent_handler = rda_gpio_irq_handler; girq->parent_handler = rda_gpio_irq_handler;