From cd3603ab3109dda72be20459fc1c595dfcff43c9 Mon Sep 17 00:00:00 2001 From: Troy Kisky Date: Fri, 24 Jun 2011 10:52:56 -0700 Subject: [PATCH] --- yaml --- r: 258647 b: refs/heads/master c: 425933b30b0ccfac58065bca6c853ea627443cdf h: refs/heads/master i: 258645: 4d84626fb3ab825d2cb04742f82a10c5b75262f7 258643: b29bda28d9f2bbe4d72521b09bf3a3c616ce334c 258639: 263dc346d3d4fea131a15caf3fc5ba050c2bbc64 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/iomux-v3.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7379d962bea3..47e9d6a23785 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 429a035d1d3f47963624baec81db9bdf81e62fb2 +refs/heads/master: 425933b30b0ccfac58065bca6c853ea627443cdf diff --git a/trunk/arch/arm/plat-mxc/include/mach/iomux-v3.h b/trunk/arch/arm/plat-mxc/include/mach/iomux-v3.h index 82620af1922f..ebbce33097a7 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/iomux-v3.h +++ b/trunk/arch/arm/plat-mxc/include/mach/iomux-v3.h @@ -66,7 +66,6 @@ typedef u64 iomux_v3_cfg_t; #define MUX_MODE_MASK ((iomux_v3_cfg_t)0x1f << MUX_MODE_SHIFT) #define MUX_PAD_CTRL_SHIFT 41 #define MUX_PAD_CTRL_MASK ((iomux_v3_cfg_t)0x1ffff << MUX_PAD_CTRL_SHIFT) -#define NO_PAD_CTRL ((iomux_v3_cfg_t)1 << (MUX_PAD_CTRL_SHIFT + 16)) #define MUX_SEL_INPUT_SHIFT 58 #define MUX_SEL_INPUT_MASK ((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT) @@ -85,6 +84,7 @@ typedef u64 iomux_v3_cfg_t; * Use to set PAD control */ +#define NO_PAD_CTRL (1 << 16) #define PAD_CTL_DVS (1 << 13) #define PAD_CTL_HYS (1 << 8)