diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-06-04 04:32:08 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-07 06:10:54 -0400 |
commit | 997d74b18ae1d0d8f4c4469a5d1ce8d73ca8402c (patch) | |
tree | 53bcb26cf57e1ecb4edc9d92c7303e5d3b4ab15c | |
parent | c5aa0ad0c557c63dcaf8c8d75a3dd4c5e90724b3 (diff) |
MXC iomux-v3: Fix defines for PAD_CTL registers
The old defines leaked in from an old version of the patch.
Change the defines to match the register layout of the iomuxer.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-v3.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h index 7cd84547658f..cd06df9370cb 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v3.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h | |||
@@ -68,28 +68,24 @@ struct pad_desc { | |||
68 | /* | 68 | /* |
69 | * Use to set PAD control | 69 | * Use to set PAD control |
70 | */ | 70 | */ |
71 | #define PAD_CTL_DRIVE_VOLTAGE_3_3_V 0 | ||
72 | #define PAD_CTL_DRIVE_VOLTAGE_1_8_V 1 | ||
73 | 71 | ||
74 | #define PAD_CTL_NO_HYSTERESIS 0 | 72 | #define PAD_CTL_DVS (1 << 13) |
75 | #define PAD_CTL_HYSTERESIS 1 | 73 | #define PAD_CTL_HYS (1 << 8) |
76 | 74 | ||
77 | #define PAD_CTL_PULL_DISABLED 0x0 | 75 | #define PAD_CTL_PKE (1 << 7) |
78 | #define PAD_CTL_PULL_KEEPER 0xa | 76 | #define PAD_CTL_PUE (1 << 6) |
79 | #define PAD_CTL_PULL_DOWN_100K 0xc | 77 | #define PAD_CTL_PUS_100K_DOWN (0 << 4) |
80 | #define PAD_CTL_PULL_UP_47K 0xd | 78 | #define PAD_CTL_PUS_47K_UP (1 << 4) |
81 | #define PAD_CTL_PULL_UP_100K 0xe | 79 | #define PAD_CTL_PUS_100K_UP (2 << 4) |
82 | #define PAD_CTL_PULL_UP_22K 0xf | 80 | #define PAD_CTL_PUS_22K_UP (3 << 4) |
83 | 81 | ||
84 | #define PAD_CTL_OUTPUT_CMOS 0 | 82 | #define PAD_CTL_ODE (1 << 3) |
85 | #define PAD_CTL_OUTPUT_OPEN_DRAIN 1 | ||
86 | 83 | ||
87 | #define PAD_CTL_DRIVE_STRENGTH_NORM 0 | 84 | #define PAD_CTL_DSE_STANDARD (0 << 1) |
88 | #define PAD_CTL_DRIVE_STRENGTH_HIGH 1 | 85 | #define PAD_CTL_DSE_HIGH (1 << 1) |
89 | #define PAD_CTL_DRIVE_STRENGTH_MAX 2 | 86 | #define PAD_CTL_DSE_MAX (2 << 1) |
90 | 87 | ||
91 | #define PAD_CTL_SLEW_RATE_SLOW 0 | 88 | #define PAD_CTL_SRE_FAST (1 << 0) |
92 | #define PAD_CTL_SLEW_RATE_FAST 1 | ||
93 | 89 | ||
94 | /* | 90 | /* |
95 | * setups a single pad: | 91 | * setups a single pad: |