diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-18 13:54:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-18 17:43:20 -0500 |
| commit | 8ea05705a70135a94419b0d243666c1b51fe1f8d (patch) | |
| tree | 495da728ccebe411445c144fb88ba35041db2096 /arch/arm/include/asm/imx-common/iomux-v3.h | |
| parent | 0b4bc1b3ab1850fccbade3e6103f2036f6bdb364 (diff) | |
| parent | 854bb75be98ad792ff64c26ae38a1392ea185cd6 (diff) | |
| download | u-boot-imx-8ea05705a70135a94419b0d243666c1b51fe1f8d.zip u-boot-imx-8ea05705a70135a94419b0d243666c1b51fe1f8d.tar.gz u-boot-imx-8ea05705a70135a94419b0d243666c1b51fe1f8d.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Migrate CONFIG_ARCH_USE_MEMSET/MEMCPY with this merge.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/include/asm/imx-common/iomux-v3.h')
| -rw-r--r-- | arch/arm/include/asm/imx-common/iomux-v3.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index b3af696..7587cbb 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -144,10 +144,12 @@ typedef u64 iomux_v3_cfg_t; #define PAD_CTL_DSE_40ohm (6 << 3) #define PAD_CTL_DSE_34ohm (7 << 3) -#if defined CONFIG_MX6SL +/* i.MX6SL/SLL */ #define PAD_CTL_LVE (1 << 1) #define PAD_CTL_LVE_BIT (1 << 22) -#endif + +/* i.MX6SLL */ +#define PAD_CTL_IPD_BIT (1 << 27) #elif defined(CONFIG_VF610) |