From: b32955@freescale.com (Huang Shijie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 2/3] ARM: mxs/mx23evk: add GPMI-NFC device
Date: Thu, 30 Jun 2011 11:53:47 +0800 [thread overview]
Message-ID: <1309406028-2924-3-git-send-email-b32955@freescale.com> (raw)
In-Reply-To: <1309406028-2924-1-git-send-email-b32955@freescale.com>
add the GPMI-NFC device for mx23evk borad.
Signed-off-by: Huang Shijie <b32955@freescale.com>
---
arch/arm/mach-mxs/Kconfig | 1 +
arch/arm/mach-mxs/mach-mx23evk.c | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 1d3985f..f55bcfe 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -32,6 +32,7 @@ config MACH_MX23EVK
select SOC_IMX23
select MXS_HAVE_AMBA_DUART
select MXS_HAVE_PLATFORM_AUART
+ select MXS_HAVE_PLATFORM_GPMI_NFC
select MXS_HAVE_PLATFORM_MXS_MMC
select MXS_HAVE_PLATFORM_MXSFB
help
diff --git a/arch/arm/mach-mxs/mach-mx23evk.c b/arch/arm/mach-mxs/mach-mx23evk.c
index 3c2de33..772b373 100644
--- a/arch/arm/mach-mxs/mach-mx23evk.c
+++ b/arch/arm/mach-mxs/mach-mx23evk.c
@@ -107,6 +107,42 @@ static const iomux_cfg_t mx23evk_pads[] __initconst = {
(MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
};
+/* gpmi-nfc */
+#define MXS_PAD_GPMI_NFC (MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_NOPULL)
+static iomux_cfg_t mx23evk_gpmi_nfc_pads[] = {
+ MX23_PAD_GPMI_D00__GPMI_D00 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_D01__GPMI_D01 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_D02__GPMI_D02 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_D03__GPMI_D03 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_D04__GPMI_D04 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_D05__GPMI_D05 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_D06__GPMI_D06 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_D07__GPMI_D07 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_CLE__GPMI_CLE | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_ALE__GPMI_ALE | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_WPN__GPMI_WPN | MXS_PAD_GPMI_NFC,
+ MX23_PAD_GPMI_WRN__GPMI_WRN | MXS_PAD_GPMI_NFC,
+ MX23_PAD_GPMI_RDN__GPMI_RDN | MXS_PAD_GPMI_NFC,
+ MX23_PAD_GPMI_RDY0__GPMI_RDY0 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_RDY1__GPMI_RDY1 | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_CE0N__GPMI_CE0N | MXS_PAD_CTRL,
+ MX23_PAD_GPMI_CE1N__GPMI_CE1N | MXS_PAD_CTRL,
+};
+
+static int mx23evk_gpmi_nfc_platform_init(void)
+{
+ return mxs_iomux_setup_multiple_pads(mx23evk_gpmi_nfc_pads,
+ ARRAY_SIZE(mx23evk_gpmi_nfc_pads));
+}
+
+static const
+struct gpmi_nfc_platform_data mx23evk_gpmi_nfc_data __initconst = {
+ .platform_init = mx23evk_gpmi_nfc_platform_init,
+ .min_prop_delay_in_ns = 5,
+ .max_prop_delay_in_ns = 9,
+ .max_chip_count = 1,
+};
+
/* mxsfb (lcdif) */
static struct fb_videomode mx23evk_video_modes[] = {
{
@@ -166,6 +202,7 @@ static void __init mx23evk_init(void)
else
gpio_set_value(MX23EVK_BL_ENABLE, 1);
+ mx23_add_gpmi_nfc(&mx23evk_gpmi_nfc_data);
mx23_add_mxsfb(&mx23evk_mxsfb_pdata);
}
--
1.7.0.4
next prev parent reply other threads:[~2011-06-30 3:53 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 3:53 [PATCH v5 0/3] add the GPMI-NFC support for imx23/imx28 Huang Shijie
2011-06-30 3:53 ` [PATCH v5 1/3] ARM: mxs: add " Huang Shijie
2011-06-30 13:55 ` Arnd Bergmann
2011-06-30 14:58 ` Lothar Waßmann
2011-06-30 22:22 ` Arnd Bergmann
2011-07-01 5:59 ` Lothar Waßmann
2011-07-01 6:03 ` Wolfram Sang
2011-07-01 7:53 ` Huang Shijie
2011-07-01 8:01 ` Wolfram Sang
2011-07-01 8:39 ` Huang Shijie
2011-07-01 8:45 ` Huang Shijie
2011-07-01 9:25 ` Arnd Bergmann
2011-07-08 7:31 ` Uwe Kleine-König
2011-07-08 7:40 ` Huang Shijie
2011-07-08 9:09 ` Uwe Kleine-König
2011-07-08 9:27 ` Huang Shijie
2011-07-08 10:16 ` Uwe Kleine-König
2011-07-08 10:24 ` Lothar Waßmann
2011-07-11 8:00 ` Uwe Kleine-König
2011-07-11 8:30 ` Huang Shijie
2011-07-11 8:37 ` Lothar Waßmann
2011-07-08 9:02 ` Arnd Bergmann
2011-06-30 3:53 ` Huang Shijie [this message]
2011-06-30 7:55 ` [PATCH v5 2/3] ARM: mxs/mx23evk: add GPMI-NFC device Uwe Kleine-König
2011-06-30 8:37 ` Huang Shijie
2011-06-30 3:53 ` [PATCH v5 3/3] ARM: mxs/mx28evk: " Huang Shijie
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=1309406028-2924-3-git-send-email-b32955@freescale.com \
--to=b32955@freescale.com \
--cc=linux-arm-kernel@lists.infradead.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).