diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-10 11:11:37 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-10 11:11:37 +0100 |
commit | fed9b63ca5aa999e618140cc1cc6bd73f212ec9b (patch) | |
tree | 1dc078e208d879a65f8cc2515e0817a109272d59 /arch/arm/plat-mxc/include/mach/iomux-v3.h | |
parent | d2831d1f543489ef97a20e6e65f625e195b521bf (diff) | |
parent | 3d48e1d0e8701d004ce7e1dd66088f42e429d079 (diff) |
Merge branch 'mx51-baseport-sascha' of git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/iomux-v3.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-v3.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h index 1deda018489..f2f73d31d5b 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v3.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h @@ -81,11 +81,13 @@ struct pad_desc { #define PAD_CTL_ODE (1 << 3) -#define PAD_CTL_DSE_STANDARD (0 << 1) -#define PAD_CTL_DSE_HIGH (1 << 1) -#define PAD_CTL_DSE_MAX (2 << 1) +#define PAD_CTL_DSE_LOW (0 << 1) +#define PAD_CTL_DSE_MED (1 << 1) +#define PAD_CTL_DSE_HIGH (2 << 1) +#define PAD_CTL_DSE_MAX (3 << 1) #define PAD_CTL_SRE_FAST (1 << 0) +#define PAD_CTL_SRE_SLOW (0 << 0) /* * setups a single pad in the iomuxer |