diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-05 09:30:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-05 09:30:10 -0800 |
| commit | 49ef78e59b0749814d79eed156dcfc175fbd2f74 (patch) | |
| tree | 4dafdb84cf3c450d8fa69b1633ded9018f2d75d6 | |
| parent | c9e6606c7fe92b50a02ce51dda82586ebdf99b48 (diff) | |
| parent | 32e246b02f53b2fdaa81ea9f2ca6ff068c017fcb (diff) | |
Merge tag 'gpio-fixes-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski:
"Here are two last fixes for this release cycle from the GPIO
subsystem:
- fix irq offset calculation in gpio-aspeed-sgpio
- update the MAINTAINERS entry for gpio-brcmstb"
* tag 'gpio-fixes-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
MAINTAINERS: update gpio-brcmstb maintainers
gpio: gpio-aspeed-sgpio: Fix wrong hwirq base in irq handler
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | drivers/gpio/gpio-aspeed-sgpio.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fb18ce7168aa..dd36acc87ce6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3769,7 +3769,8 @@ S: Supported F: drivers/net/wireless/broadcom/brcm80211/ BROADCOM BRCMSTB GPIO DRIVER -M: Gregory Fong <gregory.0xf0@gmail.com> +M: Doug Berger <opendmb@gmail.com> +M: Florian Fainelli <f.fainelli@gmail.com> L: bcm-kernel-feedback-list@broadcom.com S: Supported F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt diff --git a/drivers/gpio/gpio-aspeed-sgpio.c b/drivers/gpio/gpio-aspeed-sgpio.c index 3d6ef37a7702..b3a9b8488f11 100644 --- a/drivers/gpio/gpio-aspeed-sgpio.c +++ b/drivers/gpio/gpio-aspeed-sgpio.c @@ -395,7 +395,7 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc) reg = ioread32(bank_reg(data, bank, reg_irq_status)); for_each_set_bit(p, ®, 32) - generic_handle_domain_irq(gc->irq.domain, i * 32 + p * 2); + generic_handle_domain_irq(gc->irq.domain, (i * 32 + p) * 2); } chained_irq_exit(ic, desc); |