tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 <linus.walleij@linaro.org>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

authored by

Nikita Shubin and committed by
Bartosz Golaszewski 35d9e695 f6b61541

+7 -5
+7 -5
drivers/gpio/gpio-ep93xx.c
··· 31 31 /* Maximum value for irq capable line identifiers */ 32 32 #define EP93XX_GPIO_LINE_MAX_IRQ 23 33 33 34 + #define EP93XX_GPIO_A_IRQ_BASE 64 35 + #define EP93XX_GPIO_B_IRQ_BASE 72 34 36 /* 35 37 * Static mapping of GPIO bank F IRQS: 36 38 * F0..F7 (16..24) to irq 80..87. ··· 294 292 295 293 static struct ep93xx_gpio_bank ep93xx_gpio_banks[] = { 296 294 /* Bank A has 8 IRQs */ 297 - EP93XX_GPIO_BANK("A", 0x00, 0x10, 0x90, 0, true, false, 64), 295 + EP93XX_GPIO_BANK("A", 0x00, 0x10, 0x90, 0, true, false, EP93XX_GPIO_A_IRQ_BASE), 298 296 /* Bank B has 8 IRQs */ 299 - EP93XX_GPIO_BANK("B", 0x04, 0x14, 0xac, 8, true, false, 72), 297 + EP93XX_GPIO_BANK("B", 0x04, 0x14, 0xac, 8, true, false, EP93XX_GPIO_B_IRQ_BASE), 300 298 EP93XX_GPIO_BANK("C", 0x08, 0x18, 0x00, 40, false, false, 0), 301 299 EP93XX_GPIO_BANK("D", 0x0c, 0x1c, 0x00, 24, false, false, 0), 302 300 EP93XX_GPIO_BANK("E", 0x20, 0x24, 0x00, 32, false, false, 0), 303 301 /* Bank F has 8 IRQs */ 304 - EP93XX_GPIO_BANK("F", 0x30, 0x34, 0x4c, 16, false, true, 0), 302 + EP93XX_GPIO_BANK("F", 0x30, 0x34, 0x4c, 16, false, true, EP93XX_GPIO_F_IRQ_BASE), 305 303 EP93XX_GPIO_BANK("G", 0x38, 0x3c, 0x00, 48, false, false, 0), 306 304 EP93XX_GPIO_BANK("H", 0x40, 0x44, 0x00, 56, false, false, 0), 307 305 }; ··· 402 400 /* Pick resources 1..8 for these IRQs */ 403 401 for (i = 0; i < girq->num_parents; i++) { 404 402 girq->parents[i] = platform_get_irq(pdev, i + 1); 405 - gpio_irq = EP93XX_GPIO_F_IRQ_BASE + i; 403 + gpio_irq = bank->irq_base + i; 406 404 irq_set_chip_data(gpio_irq, &epg->gc[5]); 407 405 irq_set_chip_and_handler(gpio_irq, 408 406 girq->chip, ··· 411 409 } 412 410 girq->default_type = IRQ_TYPE_NONE; 413 411 girq->handler = handle_level_irq; 414 - girq->first = EP93XX_GPIO_F_IRQ_BASE; 412 + girq->first = bank->irq_base; 415 413 } 416 414 417 415 return devm_gpiochip_add_data(dev, gc, epg);