diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-09-23 11:13:28 +0800 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-09-24 11:27:22 +0200 |
| commit | cf226d99426d822d6a40aef6a4dcddf818cba07f (patch) | |
| tree | f851680c1761799374f3fbcbed3160ed3531f00f /arch | |
| parent | 3e08e1b7274bcde611928f7fdb7c78cd5f259532 (diff) | |
| download | blackbird-obmc-uboot-cf226d99426d822d6a40aef6a4dcddf818cba07f.tar.gz blackbird-obmc-uboot-cf226d99426d822d6a40aef6a4dcddf818cba07f.zip | |
imx-common: consider mux_ctrl_ofs when setting mux_mode
Some i.MXes use __NA_ or 0 to avoid setting mux_mode, but the following patch
only take i.MX6/7 into consideration.
"c3c8a5748897b24f18618047804317167a531dd3 imx-common: fix iomux settings"
Use is_soc_type(MXC_CPU_MX7) to avoid breaking other i.MXes when
setting mux_mode.
In this patch, switch to use "asm/imx-common/sys_proto.h" to avoid
build break for "is_soc_type" for vf610 and mx25.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/imx-common/iomux-v3.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index 9b9cf58b75..228d5f8f1c 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -11,10 +11,8 @@ #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> +#include <asm/imx-common/sys_proto.h> static void *base = (void *)IOMUXC_BASE_ADDR; @@ -53,7 +51,8 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) } #endif - __raw_writel(mux_mode, base + mux_ctrl_ofs); + if (is_soc_type(MXC_SOC_MX7) || mux_ctrl_ofs) + __raw_writel(mux_mode, base + mux_ctrl_ofs); if (sel_input_ofs) __raw_writel(sel_input, base + sel_input_ofs); |
