From: richard.zhao@freescale.com (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 5/8] arm: mxc: move IOMUX_CONFIG_XXXX definitions to iomux-v3.h
Date: Thu, 30 Dec 2010 12:56:06 +0800 [thread overview]
Message-ID: <1293684968-7338-5-git-send-email-richard.zhao@freescale.com> (raw)
In-Reply-To: <1293684968-7338-4-git-send-email-richard.zhao@freescale.com>
IOMUX_CONFIG_GPIO is not for iomux-v3. It's for old freescale
iomux routines. Remove it.
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 16 ----------------
arch/arm/plat-mxc/include/mach/iomux-mx53.h | 16 ----------------
arch/arm/plat-mxc/include/mach/iomux-v3.h | 15 +++++++++++++++
3 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx51.h b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
index e1600f3..31af1f5 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx51.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
@@ -15,22 +15,6 @@
#include <mach/iomux-v3.h>
-/*
- * various IOMUX alternate output functions (1-7)
- */
-typedef enum iomux_config {
- IOMUX_CONFIG_ALT0,
- IOMUX_CONFIG_ALT1,
- IOMUX_CONFIG_ALT2,
- IOMUX_CONFIG_ALT3,
- IOMUX_CONFIG_ALT4,
- IOMUX_CONFIG_ALT5,
- IOMUX_CONFIG_ALT6,
- IOMUX_CONFIG_ALT7,
- IOMUX_CONFIG_GPIO, /* added to help user use GPIO mode */
- IOMUX_CONFIG_SION = 0x1 << 4, /* LOOPBACK:MUX SION bit */
-} iomux_pin_cfg_t;
-
/* Pad control groupings */
#define MX51_UART1_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_PUE | \
PAD_CTL_DSE_HIGH)
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
index 80cb3c5..4155124 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
@@ -21,22 +21,6 @@
#include <mach/iomux-v3.h>
-/*
- * various IOMUX alternate output functions (1-7)
- */
-typedef enum iomux_config {
- IOMUX_CONFIG_ALT0,
- IOMUX_CONFIG_ALT1,
- IOMUX_CONFIG_ALT2,
- IOMUX_CONFIG_ALT3,
- IOMUX_CONFIG_ALT4,
- IOMUX_CONFIG_ALT5,
- IOMUX_CONFIG_ALT6,
- IOMUX_CONFIG_ALT7,
- IOMUX_CONFIG_GPIO, /* added to help user use GPIO mode */
- IOMUX_CONFIG_SION = 0x1 << 4, /* LOOPBACK:MUX SION bit */
-} iomux_pin_cfg_t;
-
/* These 2 defines are for pins that may not have a mux register, but could
* have a pad setting register, and vice-versa. */
#define NON_MUX_I 0x00
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h
index 811716f..e1fd71b 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-v3.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h
@@ -54,6 +54,21 @@ typedef struct deprecated_pad_desc {
unsigned select_input:3;
} iomux_v3_cfg_t;
+/*
+ * various IOMUX alternate output functions (1-7)
+ */
+enum iomux_config {
+ IOMUX_CONFIG_ALT0,
+ IOMUX_CONFIG_ALT1,
+ IOMUX_CONFIG_ALT2,
+ IOMUX_CONFIG_ALT3,
+ IOMUX_CONFIG_ALT4,
+ IOMUX_CONFIG_ALT5,
+ IOMUX_CONFIG_ALT6,
+ IOMUX_CONFIG_ALT7,
+ IOMUX_CONFIG_SION = 0x1 << 4, /* LOOPBACK:MUX SION bit */
+};
+
static inline unsigned int MUX_CTRL_OFS(iomux_v3_cfg_t *pad)
{
return pad->mux_ctrl_ofs;
--
1.6.3.3
next prev parent reply other threads:[~2010-12-30 4:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-30 4:56 [PATCH v3 1/8] ARM: mx5: use config to define boot related addresses Richard Zhao
2010-12-30 4:56 ` [PATCH v3 2/8] arm: plat-mxc: add full parameter macro to define gpio port Richard Zhao
2010-12-30 4:56 ` [PATCH v3 3/8] arm: mx51: define mx51's own MXC_GPIO_IRQS Richard Zhao
2010-12-30 4:56 ` [PATCH v3 4/8] arm: mx5: mx51/53 have different mxc_cpu_type definition Richard Zhao
2010-12-30 4:56 ` Richard Zhao [this message]
2010-12-30 4:56 ` [PATCH v3 6/8] arm: mx50: add core functions support except clock Richard Zhao
2010-12-30 4:56 ` [PATCH v3 7/8] arm: mx50: add mx50 reference design board support Richard Zhao
2010-12-30 9:46 ` Uwe Kleine-König
2010-12-30 10:55 ` Richard Zhao
2010-12-30 9:29 ` [PATCH v3 6/8] arm: mx50: add core functions support except clock Richard Zhao
2010-12-30 9:40 ` Uwe Kleine-König
2010-12-30 10:40 ` Richard Zhao
2010-12-30 9:33 ` [PATCH v3 5/8] arm: mxc: move IOMUX_CONFIG_XXXX definitions to iomux-v3.h Uwe Kleine-König
2010-12-30 9:33 ` [PATCH v3 4/8] arm: mx5: mx51/53 have different mxc_cpu_type definition Uwe Kleine-König
2010-12-30 9:32 ` [PATCH v3 3/8] arm: mx51: define mx51's own MXC_GPIO_IRQS Uwe Kleine-König
2010-12-30 9:31 ` [PATCH v3 2/8] arm: plat-mxc: add full parameter macro to define gpio port Uwe Kleine-König
2010-12-30 9:31 ` [PATCH v3 1/8] ARM: mx5: use config to define boot related addresses Uwe Kleine-König
2010-12-30 11:00 ` Richard Zhao
2010-12-30 11:05 ` Uwe Kleine-König
2010-12-31 2:01 ` Shawn Guo
2010-12-31 2:48 ` Richard Zhao
2010-12-31 16:23 ` Uwe Kleine-König
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=1293684968-7338-5-git-send-email-richard.zhao@freescale.com \
--to=richard.zhao@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).