diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-28 17:51:13 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-28 17:51:13 +0200 |
| commit | e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c (patch) | |
| tree | fb7b4ca068bf10217d28af5c33e7a0a9c9961c6a /arch/arm/include/asm/arch-mx6/imx-regs.h | |
| parent | 9dc8fef2583f23ca6a99c6f5e709a8b80018364f (diff) | |
| parent | d6c6d127c5b948ec381fad5b24a2bc5497720644 (diff) | |
| download | u-boot-imx-e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c.zip u-boot-imx-e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c.tar.gz u-boot-imx-e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-mx6/imx-regs.h')
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/imx-regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index 03abb2a..45824f9 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -364,7 +364,7 @@ struct iomuxc { #define IOMUXC_GPR2_MODE_DISABLED 0 #define IOMUXC_GPR2_MODE_ENABLED_DI0 1 -#define IOMUXC_GPR2_MODE_ENABLED_DI1 2 +#define IOMUXC_GPR2_MODE_ENABLED_DI1 3 #define IOMUXC_GPR2_LVDS_CH1_MODE_OFFSET 2 #define IOMUXC_GPR2_LVDS_CH1_MODE_MASK (3<<IOMUXC_GPR2_LVDS_CH1_MODE_OFFSET) |