Skip to content

Commit 35d9e69

Browse files
maquefelbrgl
authored andcommitted
gpio: ep93xx: refactor base IRQ number
- use predefined constants instead of plain numbers - use provided bank IRQ number instead of defined constant for port F Reviewed-by: Linus Walleij <[email protected]> Reviewed-by: Alexander Sverdlin <[email protected]> Signed-off-by: Nikita Shubin <[email protected]> Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent f6b6154 commit 35d9e69

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

drivers/gpio/gpio-ep93xx.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
/* Maximum value for irq capable line identifiers */
3232
#define EP93XX_GPIO_LINE_MAX_IRQ 23
3333

34+
#define EP93XX_GPIO_A_IRQ_BASE 64
35+
#define EP93XX_GPIO_B_IRQ_BASE 72
3436
/*
3537
* Static mapping of GPIO bank F IRQS:
3638
* F0..F7 (16..24) to irq 80..87.
@@ -292,14 +294,14 @@ struct ep93xx_gpio_bank {
292294

293295
static struct ep93xx_gpio_bank ep93xx_gpio_banks[] = {
294296
/* Bank A has 8 IRQs */
295-
EP93XX_GPIO_BANK("A", 0x00, 0x10, 0x90, 0, true, false, 64),
297+
EP93XX_GPIO_BANK("A", 0x00, 0x10, 0x90, 0, true, false, EP93XX_GPIO_A_IRQ_BASE),
296298
/* Bank B has 8 IRQs */
297-
EP93XX_GPIO_BANK("B", 0x04, 0x14, 0xac, 8, true, false, 72),
299+
EP93XX_GPIO_BANK("B", 0x04, 0x14, 0xac, 8, true, false, EP93XX_GPIO_B_IRQ_BASE),
298300
EP93XX_GPIO_BANK("C", 0x08, 0x18, 0x00, 40, false, false, 0),
299301
EP93XX_GPIO_BANK("D", 0x0c, 0x1c, 0x00, 24, false, false, 0),
300302
EP93XX_GPIO_BANK("E", 0x20, 0x24, 0x00, 32, false, false, 0),
301303
/* Bank F has 8 IRQs */
302-
EP93XX_GPIO_BANK("F", 0x30, 0x34, 0x4c, 16, false, true, 0),
304+
EP93XX_GPIO_BANK("F", 0x30, 0x34, 0x4c, 16, false, true, EP93XX_GPIO_F_IRQ_BASE),
303305
EP93XX_GPIO_BANK("G", 0x38, 0x3c, 0x00, 48, false, false, 0),
304306
EP93XX_GPIO_BANK("H", 0x40, 0x44, 0x00, 56, false, false, 0),
305307
};
@@ -400,7 +402,7 @@ static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
400402
/* Pick resources 1..8 for these IRQs */
401403
for (i = 0; i < girq->num_parents; i++) {
402404
girq->parents[i] = platform_get_irq(pdev, i + 1);
403-
gpio_irq = EP93XX_GPIO_F_IRQ_BASE + i;
405+
gpio_irq = bank->irq_base + i;
404406
irq_set_chip_data(gpio_irq, &epg->gc[5]);
405407
irq_set_chip_and_handler(gpio_irq,
406408
girq->chip,
@@ -409,7 +411,7 @@ static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
409411
}
410412
girq->default_type = IRQ_TYPE_NONE;
411413
girq->handler = handle_level_irq;
412-
girq->first = EP93XX_GPIO_F_IRQ_BASE;
414+
girq->first = bank->irq_base;
413415
}
414416

415417
return devm_gpiochip_add_data(dev, gc, epg);

0 commit comments

Comments
 (0)