| From 6a01819234d02e985297cfc6d5536a93d7b0300f Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 13 May 2014 13:37:46 +0200 |
| Subject: pinctrl: sh-pfc: Don't set the pinmux_irq irq field for multiplatform |
| |
| In the multiplatform kernel case the IRQs associated with the PFC GPIOs |
| are specified through DT. The pinmux_irq irq field is thus ignored by |
| the code, and doesn't need to be set. |
| |
| This will allow removing the mach/irq.h include from pfc-*.c files that |
| was required for the irq_pin() macro used to initialize the irq field. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit 0e26e8dfb9dddb0559fb7cd7b53a8b497a8d4121) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pinctrl/sh-pfc/sh_pfc.h | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h |
| index ab8fd258d9ed..d482c40b012a 100644 |
| --- a/drivers/pinctrl/sh-pfc/sh_pfc.h |
| +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h |
| @@ -98,8 +98,13 @@ struct pinmux_irq { |
| const short *gpios; |
| }; |
| |
| +#ifdef CONFIG_ARCH_MULTIPLATFORM |
| +#define PINMUX_IRQ(irq_nr, ids...) \ |
| + { .gpios = (const short []) { ids, -1 } } |
| +#else |
| #define PINMUX_IRQ(irq_nr, ids...) \ |
| { .irq = irq_nr, .gpios = (const short []) { ids, -1 } } |
| +#endif |
| |
| struct pinmux_range { |
| u16 begin; |
| -- |
| 2.1.2 |
| |
