diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2011-06-24 10:52:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:06 -0700 |
| commit | 5607cbd164dc1913cc52abba893c0961617eafd2 (patch) | |
| tree | fd37b37d9bcac0ea982d1887e2160948936949c9 /arch/arm/plat-mxc/include/mach/iomux-v3.h | |
| parent | 0dd4154f666ec85b7befd5026342ebb77c6c06f0 (diff) | |
| download | kernel_samsung_smdk4412-5607cbd164dc1913cc52abba893c0961617eafd2.zip kernel_samsung_smdk4412-5607cbd164dc1913cc52abba893c0961617eafd2.tar.gz kernel_samsung_smdk4412-5607cbd164dc1913cc52abba893c0961617eafd2.tar.bz2 | |
MXC: iomux-v3: correct NO_PAD_CTRL definition
commit 425933b30b0ccfac58065bca6c853ea627443cdf upstream.
iomux-v3.c uses NO_PAD_CTRL as a 32 bit value
so it should not be shifted left by MUX_PAD_CTRL_SHIFT(41)
Previously, anything requesting NO_PAD_CTRL would get
their pad control register set to 0.
Since it is a pad control mask, place it with the other mask values.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Lothar Waßmann <LW@KARO-electronics.de>
Tested-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: John Ogness <john.ogness@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/iomux-v3.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-v3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h index 82620af..ebbce33 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v3.h +++ b/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) |