Skip to contentSkip to conversation

pinctrl: sh-pfc: r8a7740: Allow Multiplatform Build

PATCH In review Magnus Damm 1 participant 1 message May 7, 2014

Subsystems (2)
SuperH Pin control
lore
Share & tools
lore

Magnus Damm

author
#0 lore raw

PATCH 1/3 pinctrl: sh-pfc: r8a7740: Allow Multiplatform Build

From: Magnus Damm <[email protected]>

Add #ifdefs to allow r8a7740 Multiplatform build. Needed to enable r8a7740 Multiplatform support.

Signed-off-by Magnus Damm <[email protected]>

---

 drivers/pinctrl/sh-pfc/pfc-r8a7740.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-r8a7740.c +6 -1
@@ -22,7 +22,9 @@
 #include <linux/kernel.h>
 #include <linux/pinctrl/pinconf-generic.h>
 
+#ifndef CONFIG_ARCH_MULTIPLATFORM
 #include <mach/irqs.h>
+#endif
 
 #include "core.h"
 #include "sh_pfc.h"

@@ -3652,6 +3654,7 @@ static const struct pinmux_data_reg pinm
 	{ },
 };
 
+#ifndef CONFIG_ARCH_MULTIPLATFORM
 static const struct pinmux_irq pinmux_irqs[] = {
 	PINMUX_IRQ(irq_pin(0), 2,   13),	/* IRQ0A */
 	PINMUX_IRQ(irq_pin(1), 20),		/* IRQ1A */

@@ -3686,6 +3689,7 @@ static const struct pinmux_irq pinmux_ir
 	PINMUX_IRQ(irq_pin(30), 49,  171),	/* IRQ30A */
 	PINMUX_IRQ(irq_pin(31), 41,  167),	/* IRQ31A */
 };
+#endif /* CONFIG_ARCH_MULTIPLATFORM */
 
 #define PORTnCR_PULMD_OFF	(0 << 6)
 #define PORTnCR_PULMD_DOWN	(2 << 6)

@@ -3778,7 +3782,8 @@ const struct sh_pfc_soc_info r8a7740_pin
 
 	.gpio_data	= pinmux_data,
 	.gpio_data_size	= ARRAY_SIZE(pinmux_data),
-
+#ifndef CONFIG_ARCH_MULTIPLATFORM
 	.gpio_irq	= pinmux_irqs,
 	.gpio_irq_size	= ARRAY_SIZE(pinmux_irqs),
+#endif
 };