gpio: aspeed: Setup irqchip dynamically

[linux.git] / drivers / gpio / gpio-aspeed.c

diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
index 854ed3bc66a78222173bc7c866c9b1da0606f372..0da4cc786b993b8ab14e1804e3044914d32a1ced 100644 (file)
--- a/drivers/gpio/gpio-aspeed.c
+++ b/drivers/gpio/gpio-aspeed.c
@@ -52,6 +52,7 @@ struct aspeed_gpio_config {
  */
 struct aspeed_gpio {
        struct gpio_chip chip;
+       struct irq_chip irqc;
        spinlock_t lock;
        void __iomem *base;
        int irq;
@@ -681,14 +682,6 @@ static void aspeed_gpio_irq_handler(struct irq_desc *desc)
        chained_irq_exit(ic, desc);
 }
 
-static struct irq_chip aspeed_gpio_irqchip = {
-       .name           = "aspeed-gpio",
-       .irq_ack        = aspeed_gpio_irq_ack,
-       .irq_mask       = aspeed_gpio_irq_mask,
-       .irq_unmask     = aspeed_gpio_irq_unmask,
-       .irq_set_type   = aspeed_gpio_set_type,
-};
-
 static void aspeed_init_irq_valid_mask(struct gpio_chip *gc,
                                       unsigned long *valid_mask,
                                       unsigned int ngpios)
@@ -1195,7 +1188,12 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
 
                gpio->irq = rc;
                girq = &gpio->chip.irq;
-               girq->chip = &aspeed_gpio_irqchip;
+               girq->chip = &gpio->irqc;
+               girq->chip->name = dev_name(&pdev->dev);
+               girq->chip->irq_ack = aspeed_gpio_irq_ack;
+               girq->chip->irq_mask = aspeed_gpio_irq_mask;
+               girq->chip->irq_unmask = aspeed_gpio_irq_unmask;
+               girq->chip->irq_set_type = aspeed_gpio_set_type;
                girq->parent_handler = aspeed_gpio_irq_handler;
                girq->num_parents = 1;
                girq->parents = devm_kcalloc(&pdev->dev, 1,