Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / arch / arm / plat-mxc / include / mach / iomux-v3.h

diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h
index 1deda0184892b49f1f62265b9cc1d2a294d5c23d..f2f73d31d5ba5cf579d035b52b9f106c4f741d0d 100644 (file)
--- 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