Skip to contentSkip to conversation

pinctrl: sh-pfc: r8a73a4: Allow Multiplatform Build

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

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/3 pinctrl: sh-pfc: r8a73a4: Allow Multiplatform Build

From: Magnus Damm <[email protected]>

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

---

 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c |    7 +++++++
 1 file changed, 7 insertions(+)
drivers/pinctrl/sh-pfc/pfc-r8a73a4.c +7 -0
@@ -20,7 +20,10 @@
 #include <linux/io.h>
 #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"
@@ -2603,6 +2606,7 @@ static const struct pinmux_data_reg pinm
 	{ },
 };
 
+#ifndef CONFIG_ARCH_MULTIPLATFORM
 static const struct pinmux_irq pinmux_irqs[] = {
 	PINMUX_IRQ(irq_pin(0), 0),
 	PINMUX_IRQ(irq_pin(1), 1),
@@ -2663,6 +2667,7 @@ static const struct pinmux_irq pinmux_ir
 	PINMUX_IRQ(irq_pin(56), 328),
 	PINMUX_IRQ(irq_pin(57), 329),
 };
+#endif /* CONFIG_ARCH_MULTIPLATFORM */
 
 #define PORTCR_PULMD_OFF (0 << 6)
 #define PORTCR_PULMD_DOWN (2 << 6)
@@ -2741,6 +2746,8 @@ const struct sh_pfc_soc_info r8a73a4_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
 };