diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-23 10:45:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-12 22:08:07 +0200 |
| commit | e32452d777c9b42d5456f90ff82db4049de062e6 (patch) | |
| tree | ec340614a532afc468b7246337b6fadd97846458 /arch/arm/mach-imx/include/mach/iomux-v3.h | |
| parent | 652f5f5abebcd73b94e24cc1b554119fa63b015f (diff) | |
| download | barebox-e32452d777c9b42d5456f90ff82db4049de062e6.tar.gz barebox-e32452d777c9b42d5456f90ff82db4049de062e6.tar.xz | |
ARM i.MX iomux-v3: one bit more for pad_ctl
i.MX6 needs one bit more for PAD_CTRL, so make one free.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/include/mach/iomux-v3.h')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/iomux-v3.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/include/mach/iomux-v3.h b/arch/arm/mach-imx/include/mach/iomux-v3.h index f2f0ccf0ee..2c92342085 100644 --- a/arch/arm/mach-imx/include/mach/iomux-v3.h +++ b/arch/arm/mach-imx/include/mach/iomux-v3.h @@ -48,8 +48,8 @@ * PAD_CTRL_OFS: 12..23 (12) * SEL_INPUT_OFS: 24..35 (12) * MUX_MODE + SION: 36..40 (5) - * PAD_CTRL + NO_PAD_CTRL: 41..57 (17) - * SEL_INP: 58..61 (4) + * PAD_CTRL + NO_PAD_CTRL: 41..58 (18) + * SEL_INP: 59..62 (4) * reserved: 63 (1) */ @@ -65,8 +65,8 @@ typedef u64 iomux_v3_cfg_t; #define MUX_MODE_SHIFT 36 #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 MUX_SEL_INPUT_SHIFT 58 +#define MUX_PAD_CTRL_MASK ((iomux_v3_cfg_t)0x3ffff << MUX_PAD_CTRL_SHIFT) +#define MUX_SEL_INPUT_SHIFT 59 #define MUX_SEL_INPUT_MASK ((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT) #define MUX_PAD_CTRL(x) ((iomux_v3_cfg_t)(x) << MUX_PAD_CTRL_SHIFT) @@ -85,7 +85,7 @@ typedef u64 iomux_v3_cfg_t; * Use to set PAD control */ -#define NO_PAD_CTRL (1 << 16) +#define NO_PAD_CTRL (1 << 17) #define PAD_CTL_DVS (1 << 13) #define PAD_CTL_HYS (1 << 8) |