diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-01 09:56:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-01 10:01:00 -0500 |
| commit | 522e035441ca04d99de2fc13b614ad896691e9c9 (patch) | |
| tree | 875c0923d24447550db43f6f1b767dea82dccb06 /arch/arm/include/asm/mach-imx/iomux-v3.h | |
| parent | 08337cd64832ed7f8147da75013510b92bbcd188 (diff) | |
| parent | 57d2beb91d705bccdfee5e9e5fd267f5e363a100 (diff) | |
Merge tag 'u-boot-imx-20190101' of git://www.denx.de/git/u-boot-imx
imx for 2019.01
- introduce support for i.MX8M
- fix size limit for Vhybrid / pico boards
- several board fixes
- w1 driver for MX2x / MX5x
Diffstat (limited to 'arch/arm/include/asm/mach-imx/iomux-v3.h')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/iomux-v3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h index 63f4b33aeb..b899a4ff6f 100644 --- a/arch/arm/include/asm/mach-imx/iomux-v3.h +++ b/arch/arm/include/asm/mach-imx/iomux-v3.h @@ -86,7 +86,7 @@ typedef u64 iomux_v3_cfg_t; #define IOMUX_CONFIG_LPSR 0x20 #define MUX_MODE_LPSR ((iomux_v3_cfg_t)IOMUX_CONFIG_LPSR << \ MUX_MODE_SHIFT) -#ifdef CONFIG_MX8M +#ifdef CONFIG_IMX8M #define PAD_CTL_DSE0 (0x0 << 0) #define PAD_CTL_DSE1 (0x1 << 0) #define PAD_CTL_DSE2 (0x2 << 0) |