diff options
author | Richard Zhao <richard.zhao@freescale.com> | 2011-01-06 06:05:39 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-07 09:20:52 -0500 |
commit | 14c6500e7547704255f94c63fc6016ae5cbed1c9 (patch) | |
tree | 8da665af82d969f8632fbe9781645331a91f844b /arch/arm/plat-mxc | |
parent | a58154d1c3535f451a409abbd0bda6770b2d9380 (diff) |
arm: mxc: move IOMUX_CONFIG_SION definition to iomux-v3.h
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx53.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h index 5deee019c29e..2673007d3eb2 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h | |||
@@ -34,7 +34,6 @@ typedef enum iomux_config { | |||
34 | IOMUX_CONFIG_ALT6, | 34 | IOMUX_CONFIG_ALT6, |
35 | IOMUX_CONFIG_ALT7, | 35 | IOMUX_CONFIG_ALT7, |
36 | IOMUX_CONFIG_GPIO, /* added to help user use GPIO mode */ | 36 | IOMUX_CONFIG_GPIO, /* added to help user use GPIO mode */ |
37 | IOMUX_CONFIG_SION = 0x1 << 4, /* LOOPBACK:MUX SION bit */ | ||
38 | } iomux_pin_cfg_t; | 37 | } iomux_pin_cfg_t; |
39 | 38 | ||
40 | /* These 2 defines are for pins that may not have a mux register, but could | 39 | /* These 2 defines are for pins that may not have a mux register, but could |
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h index 2277b01c855d..82620af1922f 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v3.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h | |||
@@ -105,6 +105,7 @@ typedef u64 iomux_v3_cfg_t; | |||
105 | #define PAD_CTL_SRE_FAST (1 << 0) | 105 | #define PAD_CTL_SRE_FAST (1 << 0) |
106 | #define PAD_CTL_SRE_SLOW (0 << 0) | 106 | #define PAD_CTL_SRE_SLOW (0 << 0) |
107 | 107 | ||
108 | #define IOMUX_CONFIG_SION (0x1 << 4) | ||
108 | 109 | ||
109 | #define MX51_NUM_GPIO_PORT 4 | 110 | #define MX51_NUM_GPIO_PORT 4 |
110 | 111 | ||