Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02ec4747 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v3.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:
 "Here are three pin control fixes for the v3.16 series.  Sorry that
  some of these arrive late, the summer heat in Sweden makes me slow.

   - an IRQ handling fix for the STi driver, also for stable
   - another IRQ fix for the RCAR GPIO driver
   - a MAINTAINERS entry"

* tag 'pinctrl-v3.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  gpio: rcar: Add support for DT IRQ flags
  MAINTAINERS: Add entry for the Renesas pin controller driver
  pinctrl: st: Fix irqmux handler
parents ea9339e5 fe132649

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -6956,6 +6956,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	drivers/pinctrl/pinctrl-at91.c



PIN CONTROLLER - RENESAS

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

L:	linux-sh@vger.kernel.org

S:	Maintained

F:	drivers/pinctrl/sh-pfc/



PIN CONTROLLER - SAMSUNG

M:	Tomasz Figa <t.figa@samsung.com>

M:	Thomas Abraham <thomas.abraham@linaro.org>

drivers/gpio/gpio-rcar.c

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ static int gpio_rcar_irq_domain_map(struct irq_domain *h, unsigned int irq, 


static struct irq_domain_ops gpio_rcar_irq_domain_ops = {

	.map	= gpio_rcar_irq_domain_map,

	.xlate	= irq_domain_xlate_twocell,

};



struct gpio_rcar_info {

drivers/pinctrl/pinctrl-st.c

+1 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ static void st_gpio_irqmux_handler(unsigned irq, struct irq_desc *desc) 


	status = readl(info->irqmux_base);



	for_each_set_bit(n, &status, ST_GPIO_PINS_PER_BANK)

	for_each_set_bit(n, &status, info->nbanks)

		__gpio_irq_handler(&info->banks[n]);



	chained_irq_exit(chip, desc);