diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 21:00:34 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 21:00:34 (GMT) |
| commit | d6694aff569a0838a9d0ef352128f5aa309d73ff (patch) | |
| tree | a94eeab5431dfd0ed91a510c2e7de5eebb7a78fc /arch/arm/imx-common/iomux-v3.c | |
| parent | b5b8d85e9a50c2294b6043830cd045de1002dc5d (diff) | |
| parent | 3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0 (diff) | |
| download | u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.xz | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/imx-common/iomux-v3.c')
| -rw-r--r-- | arch/arm/imx-common/iomux-v3.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index 6e46ea8..22cd11a 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -11,6 +11,9 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> +#if !defined(CONFIG_MX25) && !defined(CONFIG_VF610) +#include <asm/arch/sys_proto.h> +#endif #include <asm/imx-common/iomux-v3.h> static void *base = (void *)IOMUXC_BASE_ADDR; @@ -54,12 +57,23 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) #endif } +/* configures a list of pads within declared with IOMUX_PADS macro */ void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list, unsigned count) { iomux_v3_cfg_t const *p = pad_list; + int stride; int i; - for (i = 0; i < count; i++) - imx_iomux_v3_setup_pad(*p++); +#if defined(CONFIG_MX6QDL) + stride = 2; + if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D)) + p += 1; +#else + stride = 1; +#endif + for (i = 0; i < count; i++) { + imx_iomux_v3_setup_pad(*p); + p += stride; + } } |