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

gpio: eic-sprd: Optimize the calculation method of eic number

The num_eics is a default value, but some SoCs support more than 8.
In order to adapt to all projects, the total number of eics is
automatically calculated through dts.

Signed-off-by: Wenhua Lin <Wenhua.Lin@unisoc.com>
Acked-by: Chunyan Zhang <zhang.lyra@gmail.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

authored by

Wenhua Lin and committed by
Bartosz Golaszewski
44a0d880 c055f7ed

+4 -6
+4 -6
drivers/gpio/gpio-eic-sprd.c
··· 108 108 109 109 struct sprd_eic_variant_data { 110 110 enum sprd_eic_type type; 111 - u32 num_eics; 112 111 }; 113 112 114 113 static const char *sprd_eic_label_name[SPRD_EIC_MAX] = { ··· 117 118 118 119 static const struct sprd_eic_variant_data sc9860_eic_dbnc_data = { 119 120 .type = SPRD_EIC_DEBOUNCE, 120 - .num_eics = 8, 121 121 }; 122 122 123 123 static const struct sprd_eic_variant_data sc9860_eic_latch_data = { 124 124 .type = SPRD_EIC_LATCH, 125 - .num_eics = 8, 126 125 }; 127 126 128 127 static const struct sprd_eic_variant_data sc9860_eic_async_data = { 129 128 .type = SPRD_EIC_ASYNC, 130 - .num_eics = 8, 131 129 }; 132 130 133 131 static const struct sprd_eic_variant_data sc9860_eic_sync_data = { 134 132 .type = SPRD_EIC_SYNC, 135 - .num_eics = 8, 136 133 }; 137 134 138 135 static inline void __iomem *sprd_eic_offset_base(struct sprd_eic *sprd_eic, ··· 590 595 struct gpio_irq_chip *irq; 591 596 struct sprd_eic *sprd_eic; 592 597 struct resource *res; 598 + u16 num_banks = 0; 593 599 int ret, i; 594 600 595 601 pdata = of_device_get_match_data(dev); ··· 624 628 sprd_eic->base[i] = devm_ioremap_resource(dev, res); 625 629 if (IS_ERR(sprd_eic->base[i])) 626 630 return PTR_ERR(sprd_eic->base[i]); 631 + 632 + num_banks++; 627 633 } 628 634 629 635 sprd_eic->chip.label = sprd_eic_label_name[sprd_eic->type]; 630 - sprd_eic->chip.ngpio = pdata->num_eics; 636 + sprd_eic->chip.ngpio = num_banks * SPRD_EIC_PER_BANK_NR; 631 637 sprd_eic->chip.base = -1; 632 638 sprd_eic->chip.parent = dev; 633 639 sprd_eic->chip.direction_input = sprd_eic_direction_input;