From cf226d99426d822d6a40aef6a4dcddf818cba07f Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Wed, 23 Sep 2015 11:13:28 +0800 Subject: imx-common: consider mux_ctrl_ofs when setting mux_mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Cc: Bhuvanchandra DV Cc: Stefano Babic Cc: Fabio Estevam Acked-by: Stefano Babic Reviewed-by: Benoît Thébaudeau --- arch/arm/imx-common/iomux-v3.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'arch') 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 #include #include -#if !defined(CONFIG_MX25) && !defined(CONFIG_VF610) -#include -#endif #include +#include 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); -- cgit v1.2.1