diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-11 10:10:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-11 10:10:04 -0700 |
| commit | 8b02c5ef75814b690ad8eb271cca2559ce7d19b8 (patch) | |
| tree | 1c9643b2da01bcd41c852423a2f28ddb7b6b597c | |
| parent | c8c16e3624ec9e2b36b76b34266c5064ec7e5f98 (diff) | |
| parent | fea685e9f9d0c3d273aa861891bf5ac952012d21 (diff) | |
| download | kgraft-8b02c5ef75814b690ad8eb271cca2559ce7d19b8.tar.gz | |
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
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-baytrail.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5e7866a486b0c3..34091d78a4ef3d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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/ diff --git a/drivers/pinctrl/pinctrl-baytrail.c b/drivers/pinctrl/pinctrl-baytrail.c index 9ca59a01874316..e12e5b07f6d751 100644 --- a/drivers/pinctrl/pinctrl-baytrail.c +++ b/drivers/pinctrl/pinctrl-baytrail.c @@ -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) |