From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH 01/03] pinctrl: sh-pfc: r8a7740: Allow Multiplatform Build
Date: Wed, 07 May 2014 23:17:58 +0000 [thread overview]
Message-ID: <20140507231758.29661.57103.sendpatchset@w520> (raw)
From: Magnus Damm <damm+renesas@opensource.se>
Add #ifdefs to allow r8a7740 Multiplatform build. Needed
to enable r8a7740 Multiplatform support.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- 0001/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
+++ work/drivers/pinctrl/sh-pfc/pfc-r8a7740.c 2014-04-24 19:13:59.000000000 +0900
@@ -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
};
reply other threads:[~2014-05-07 23:17 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=20140507231758.29661.57103.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).