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>
---
 drivers/gpio/gpio-eic-sprd.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c
index 806b88d8dfb7..2dd0e46c42ad 100644
--- a/drivers/gpio/gpio-eic-sprd.c
+++ b/drivers/gpio/gpio-eic-sprd.c
@@ -108,7 +108,6 @@ static struct sprd_eic *to_sprd_eic(struct notifier_block *nb)
 
 struct sprd_eic_variant_data {
 	enum sprd_eic_type type;
-	u32 num_eics;
 };
 
 static const char *sprd_eic_label_name[SPRD_EIC_MAX] = {
@@ -118,22 +117,18 @@ static const char *sprd_eic_label_name[SPRD_EIC_MAX] = {
 
 static const struct sprd_eic_variant_data sc9860_eic_dbnc_data = {
 	.type = SPRD_EIC_DEBOUNCE,
-	.num_eics = 8,
 };
 
 static const struct sprd_eic_variant_data sc9860_eic_latch_data = {
 	.type = SPRD_EIC_LATCH,
-	.num_eics = 8,
 };
 
 static const struct sprd_eic_variant_data sc9860_eic_async_data = {
 	.type = SPRD_EIC_ASYNC,
-	.num_eics = 8,
 };
 
 static const struct sprd_eic_variant_data sc9860_eic_sync_data = {
 	.type = SPRD_EIC_SYNC,
-	.num_eics = 8,
 };
 
 static inline void __iomem *sprd_eic_offset_base(struct sprd_eic *sprd_eic,
@@ -619,6 +614,7 @@ static int sprd_eic_probe(struct platform_device *pdev)
 	struct gpio_irq_chip *irq;
 	struct sprd_eic *sprd_eic;
 	struct resource *res;
+	u16 num_banks = 0;
 	int ret, i;
 
 	pdata = of_device_get_match_data(dev);
@@ -652,10 +648,12 @@ static int sprd_eic_probe(struct platform_device *pdev)
 		sprd_eic->base[i] = devm_ioremap_resource(dev, res);
 		if (IS_ERR(sprd_eic->base[i]))
 			return PTR_ERR(sprd_eic->base[i]);
+
+		num_banks++;
 	}
 
 	sprd_eic->chip.label = sprd_eic_label_name[sprd_eic->type];
-	sprd_eic->chip.ngpio = pdata->num_eics;
+	sprd_eic->chip.ngpio = num_banks * SPRD_EIC_PER_BANK_NR;
 	sprd_eic->chip.base = -1;
 	sprd_eic->chip.parent = dev;
 	sprd_eic->chip.direction_input = sprd_eic_direction_input;
-- 
2.17.1

On Tue, 9 Jan 2024 at 15:39, Wenhua Lin <Wenhua.Lin@unisoc.com> wrote:
>
> 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>

Thanks,
Chunyan

> ---
>  drivers/gpio/gpio-eic-sprd.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c
> index 806b88d8dfb7..2dd0e46c42ad 100644
> --- a/drivers/gpio/gpio-eic-sprd.c
> +++ b/drivers/gpio/gpio-eic-sprd.c
> @@ -108,7 +108,6 @@ static struct sprd_eic *to_sprd_eic(struct notifier_block *nb)
>
>  struct sprd_eic_variant_data {
>         enum sprd_eic_type type;
> -       u32 num_eics;
>  };
>
>  static const char *sprd_eic_label_name[SPRD_EIC_MAX] = {
> @@ -118,22 +117,18 @@ static const char *sprd_eic_label_name[SPRD_EIC_MAX] = {
>
>  static const struct sprd_eic_variant_data sc9860_eic_dbnc_data = {
>         .type = SPRD_EIC_DEBOUNCE,
> -       .num_eics = 8,
>  };
>
>  static const struct sprd_eic_variant_data sc9860_eic_latch_data = {
>         .type = SPRD_EIC_LATCH,
> -       .num_eics = 8,
>  };
>
>  static const struct sprd_eic_variant_data sc9860_eic_async_data = {
>         .type = SPRD_EIC_ASYNC,
> -       .num_eics = 8,
>  };
>
>  static const struct sprd_eic_variant_data sc9860_eic_sync_data = {
>         .type = SPRD_EIC_SYNC,
> -       .num_eics = 8,
>  };
>
>  static inline void __iomem *sprd_eic_offset_base(struct sprd_eic *sprd_eic,
> @@ -619,6 +614,7 @@ static int sprd_eic_probe(struct platform_device *pdev)
>         struct gpio_irq_chip *irq;
>         struct sprd_eic *sprd_eic;
>         struct resource *res;
> +       u16 num_banks = 0;
>         int ret, i;
>
>         pdata = of_device_get_match_data(dev);
> @@ -652,10 +648,12 @@ static int sprd_eic_probe(struct platform_device *pdev)
>                 sprd_eic->base[i] = devm_ioremap_resource(dev, res);
>                 if (IS_ERR(sprd_eic->base[i]))
>                         return PTR_ERR(sprd_eic->base[i]);
> +
> +               num_banks++;
>         }
>
>         sprd_eic->chip.label = sprd_eic_label_name[sprd_eic->type];
> -       sprd_eic->chip.ngpio = pdata->num_eics;
> +       sprd_eic->chip.ngpio = num_banks * SPRD_EIC_PER_BANK_NR;
>         sprd_eic->chip.base = -1;
>         sprd_eic->chip.parent = dev;
>         sprd_eic->chip.direction_input = sprd_eic_direction_input;
> --
> 2.17.1
>