gpio: eic: sprd: Fix the incorrect EIC offset when toggling

Message ID 5ca714b7bbd12ce24a6e8cc278eb438c576fa75d.1568627608.git.baolin.wang@linaro.org
State New
Headers show
Series
  • gpio: eic: sprd: Fix the incorrect EIC offset when toggling
Related show

Commit Message

(Exiting) Baolin Wang Sept. 16, 2019, 9:56 a.m.
From: Bruce Chen <bruce.chen@unisoc.com>


When toggling the level trigger to emulate the edge trigger, the
EIC offset is incorrect without adding the corresponding bank index,
thus fix it.

Fixes: 7bf0d7f62282 ("gpio: eic: Add edge trigger emulation for EIC")
Signed-off-by: Bruce Chen <bruce.chen@unisoc.com>

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>

---
 drivers/gpio/gpio-eic-sprd.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

-- 
1.7.9.5

Comments

Bartosz Golaszewski Sept. 17, 2019, 8:09 a.m. | #1
pon., 16 wrz 2019 o 11:57 Baolin Wang <baolin.wang@linaro.org> napisaƂ(a):
>

> From: Bruce Chen <bruce.chen@unisoc.com>

>

> When toggling the level trigger to emulate the edge trigger, the

> EIC offset is incorrect without adding the corresponding bank index,

> thus fix it.

>

> Fixes: 7bf0d7f62282 ("gpio: eic: Add edge trigger emulation for EIC")

> Signed-off-by: Bruce Chen <bruce.chen@unisoc.com>

> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>

> ---

>  drivers/gpio/gpio-eic-sprd.c |    7 ++++---

>  1 file changed, 4 insertions(+), 3 deletions(-)

>

> diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c

> index 7b9ac4a..090539f 100644

> --- a/drivers/gpio/gpio-eic-sprd.c

> +++ b/drivers/gpio/gpio-eic-sprd.c

> @@ -530,11 +530,12 @@ static void sprd_eic_handle_one_type(struct gpio_chip *chip)

>                 }

>

>                 for_each_set_bit(n, &reg, SPRD_EIC_PER_BANK_NR) {

> -                       girq = irq_find_mapping(chip->irq.domain,

> -                                       bank * SPRD_EIC_PER_BANK_NR + n);

> +                       u32 offset = bank * SPRD_EIC_PER_BANK_NR + n;

> +

> +                       girq = irq_find_mapping(chip->irq.domain, offset);

>

>                         generic_handle_irq(girq);

> -                       sprd_eic_toggle_trigger(chip, girq, n);

> +                       sprd_eic_toggle_trigger(chip, girq, offset);

>                 }

>         }

>  }

> --

> 1.7.9.5

>


Queued for fixes.

Bart

Patch

diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c
index 7b9ac4a..090539f 100644
--- a/drivers/gpio/gpio-eic-sprd.c
+++ b/drivers/gpio/gpio-eic-sprd.c
@@ -530,11 +530,12 @@  static void sprd_eic_handle_one_type(struct gpio_chip *chip)
 		}
 
 		for_each_set_bit(n, &reg, SPRD_EIC_PER_BANK_NR) {
-			girq = irq_find_mapping(chip->irq.domain,
-					bank * SPRD_EIC_PER_BANK_NR + n);
+			u32 offset = bank * SPRD_EIC_PER_BANK_NR + n;
+
+			girq = irq_find_mapping(chip->irq.domain, offset);
 
 			generic_handle_irq(girq);
-			sprd_eic_toggle_trigger(chip, girq, n);
+			sprd_eic_toggle_trigger(chip, girq, offset);
 		}
 	}
 }