linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH 03/03] pinctrl: sh-pfc: r8a73a4: Allow Multiplatform Build
Date: Wed, 07 May 2014 23:18:17 +0000	[thread overview]
Message-ID: <20140507231817.29661.71080.sendpatchset@w520> (raw)

From: Magnus Damm <damm+renesas@opensource.se>

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

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- 0001/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
+++ work/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c	2014-04-24 19:25:28.000000000 +0900
@@ -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
 };

                 reply	other threads:[~2014-05-07 23:18 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140507231817.29661.71080.sendpatchset@w520 \
    --to=magnus.damm@gmail.com \
    --cc=linux-sh@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).