Commit 49ef78e5 authored Jan 05, 2022 by Linus Torvalds

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

parents c9e6606c 32e246b0

MAINTAINERS

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3769,7 +3769,8 @@ S: Supported
	F: drivers/net/wireless/broadcom/brcm80211/		F: drivers/net/wireless/broadcom/brcm80211/

	BROADCOM BRCMSTB GPIO DRIVER		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		L: bcm-kernel-feedback-list@broadcom.com
	S: Supported		S: Supported
	F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt		F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt

drivers/gpio/gpio-aspeed-sgpio.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -395,7 +395,7 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc)
	reg = ioread32(bank_reg(data, bank, reg_irq_status));		reg = ioread32(bank_reg(data, bank, reg_irq_status));

	for_each_set_bit(p, &reg, 32)		for_each_set_bit(p, &reg, 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);		chained_irq_exit(ic, desc);