From d638c36e1208d20a610101a124bf585ef59a8dc5 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Mon, 10 Oct 2011 11:19:23 +0400 Subject: [PATCH] --- yaml --- r: 272485 b: refs/heads/master c: 6571534b600b8ca1936ff5630b9e0947f21faf16 h: refs/heads/master i: 272483: be41e514deeb0b855ff06b71cbd71c86aa680ba5 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/iomux-v3.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index cfb91f379e2a..ea85fe3b69d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d093d5bbdb255b64d9dd6478d1d534e2101f9a70 +refs/heads/master: 6571534b600b8ca1936ff5630b9e0947f21faf16 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 ebbce33097a7..45099566fecc 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/iomux-v3.h +++ b/trunk/arch/arm/plat-mxc/include/mach/iomux-v3.h @@ -89,11 +89,11 @@ typedef u64 iomux_v3_cfg_t; #define PAD_CTL_HYS (1 << 8) #define PAD_CTL_PKE (1 << 7) -#define PAD_CTL_PUE (1 << 6) -#define PAD_CTL_PUS_100K_DOWN (0 << 4) -#define PAD_CTL_PUS_47K_UP (1 << 4) -#define PAD_CTL_PUS_100K_UP (2 << 4) -#define PAD_CTL_PUS_22K_UP (3 << 4) +#define PAD_CTL_PUE (1 << 6 | PAD_CTL_PKE) +#define PAD_CTL_PUS_100K_DOWN (0 << 4 | PAD_CTL_PUE) +#define PAD_CTL_PUS_47K_UP (1 << 4 | PAD_CTL_PUE) +#define PAD_CTL_PUS_100K_UP (2 << 4 | PAD_CTL_PUE) +#define PAD_CTL_PUS_22K_UP (3 << 4 | PAD_CTL_PUE) #define PAD_CTL_ODE (1 << 3)