diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 08:49:58 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 08:49:58 +0100 |
| commit | a891601ce51edbafa1a2750c96a618e4fcbca1c2 (patch) | |
| tree | 9a5d44eb1fcca45dfd30557318f786b66392a8f3 /arch/arm/include/asm/imx-common/iomux-v3.h | |
| parent | 2931fa4db349c97f882ffda42e901208654b5ca9 (diff) | |
| parent | 4611d5bab26f93471b84f6f33967cef69b3f723a (diff) | |
| download | u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.zip u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.gz u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
include/micrel.h
The conflict above was trivial, caused by four lines being
added in both branches with different whitepace.
Diffstat (limited to 'arch/arm/include/asm/imx-common/iomux-v3.h')
| -rw-r--r-- | arch/arm/include/asm/imx-common/iomux-v3.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index dc2b3ef..dec11a1 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -63,6 +63,8 @@ typedef u64 iomux_v3_cfg_t; #define MUX_SEL_INPUT_SHIFT 59 #define MUX_SEL_INPUT_MASK ((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT) +#define MUX_MODE_SION ((iomux_v3_cfg_t)IOMUX_CONFIG_SION << \ + MUX_MODE_SHIFT) #define MUX_PAD_CTRL(x) ((iomux_v3_cfg_t)(x) << MUX_PAD_CTRL_SHIFT) #define IOMUX_PAD(pad_ctrl_ofs, mux_ctrl_ofs, mux_mode, sel_input_ofs, \ |