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

Commit 8b02c5ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull two pin control fixes from Linus Walleij:
 - fix a warning about unbalanced IRQs on the Baytrail
 - update Tomasz Figa's address in MAINTAINERS

* tag 'pinctrl-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  MAINTAINERS: Tomasz has moved
  pinctrl: baytrail: resolve unbalanced IRQ wake disable warning
parents c8c16e36 fea685e9

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -7053,7 +7053,7 @@ S: Maintained 
F:	drivers/pinctrl/sh-pfc/



PIN CONTROLLER - SAMSUNG

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

M:	Tomasz Figa <tomasz.figa@gmail.com>

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

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
@@ -7899,7 +7899,8 @@ S: Supported 
F:	drivers/media/i2c/s5k5baf.c



SAMSUNG SOC CLOCK DRIVERS

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

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

M:	Tomasz Figa <tomasz.figa@gmail.com>

S:	Supported

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

F:	drivers/clk/samsung/

drivers/pinctrl/pinctrl-baytrail.c

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static struct irq_chip byt_irqchip = { 
	.irq_mask = byt_irq_mask,

	.irq_unmask = byt_irq_unmask,

	.irq_set_type = byt_irq_type,

	.flags = IRQCHIP_SKIP_SET_WAKE,

};



static void byt_gpio_irq_init_hw(struct byt_gpio *vg)