summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Liu <r64343@freescale.com>2012-04-11 19:35:13 +0800
committerJason Liu <r64343@freescale.com>2012-04-13 15:41:00 +0800
commitd3020f5dfa80f3c106aea7ec030dd5081416aac7 (patch)
treea3cde1f4cc24b745c0e95f362967053772c39aab
parent339d6552722c2c1e666fd7a61c12b380bd5282ca (diff)
downloadu-boot-imx-d3020f5dfa80f3c106aea7ec030dd5081416aac7.zip
u-boot-imx-d3020f5dfa80f3c106aea7ec030dd5081416aac7.tar.gz
u-boot-imx-d3020f5dfa80f3c106aea7ec030dd5081416aac7.tar.bz2
ENGR00179437-2 u-boot: mx6q: iomux: code clean upimx-android-r13.2.1imx_v2009.08
Remove the dead definiton which never used by iomux-v3 framework And move the SION bit definiton to arch-mx6/iomux-v3.h for sharing Signed-off-by: Jason Liu <r64343@freescale.com>
-rw-r--r--include/asm-arm/arch-mx6/iomux-v3.h1
-rw-r--r--include/asm-arm/arch-mx6/mx6_pins.h16
2 files changed, 1 insertions, 16 deletions
diff --git a/include/asm-arm/arch-mx6/iomux-v3.h b/include/asm-arm/arch-mx6/iomux-v3.h
index b67a31f..49487fb 100644
--- a/include/asm-arm/arch-mx6/iomux-v3.h
+++ b/include/asm-arm/arch-mx6/iomux-v3.h
@@ -93,6 +93,7 @@ typedef u64 iomux_v3_cfg_t;
#define NO_PAD_I 0
#define NO_MUX_I 0
+#define IOMUX_CONFIG_SION (0x1 << 4)
#define PAD_CTL_PUS_100K_DOWN (0 << 14)
#define PAD_CTL_PUS_47K_UP (1 << 14)
diff --git a/include/asm-arm/arch-mx6/mx6_pins.h b/include/asm-arm/arch-mx6/mx6_pins.h
index a7a2041..bfbf721 100644
--- a/include/asm-arm/arch-mx6/mx6_pins.h
+++ b/include/asm-arm/arch-mx6/mx6_pins.h
@@ -24,22 +24,6 @@
#include <asm/arch/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;
-
#define MX6Q_UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS)