diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-08 12:51:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-08 12:51:47 -0500 |
| commit | 2f4c9de3d00b09f74eaf9598ea4edbbc4f99b62d (patch) | |
| tree | 253415eae65bc1685bb8722dbd38b0697e7aa7b8 /arch/arm/include/asm/mach-imx/iomux-v3.h | |
| parent | 5e2338079d4497fe87db60b791203e760493780c (diff) | |
| parent | ca9d211e2c7801bc3e194d325ece0d3b583b32d2 (diff) | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm/mach-imx/iomux-v3.h')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/iomux-v3.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h index ad35e0109e..ed75e9cd9a 100644 --- a/arch/arm/include/asm/mach-imx/iomux-v3.h +++ b/arch/arm/include/asm/mach-imx/iomux-v3.h @@ -127,7 +127,7 @@ typedef u64 iomux_v3_cfg_t; #define PAD_CTL_ODE (1 << 11) -#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) +#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) #define PAD_CTL_SPEED_LOW (0 << 6) #else #define PAD_CTL_SPEED_LOW (1 << 6) @@ -253,7 +253,7 @@ if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) { \ imx_iomux_v3_setup_pad(MX6Q_##def); #define SETUP_IOMUX_PADS(x) \ imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) -#elif defined(CONFIG_MX6UL) +#elif defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) #define IOMUX_PADS(x) MX6_##x #define SETUP_IOMUX_PAD(def) \ imx_iomux_v3_setup_pad(MX6_##def); |