Hi Peng, On 23/09/2015 05:13, Peng Fan wrote: > 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 <[email protected]> > Cc: Bhuvanchandra DV <[email protected]> > Cc: Stefano Babic <[email protected]> > Cc: Fabio Estevam <[email protected]> > --- > > Changes v2: > refine commit msg, "add mx25". > use cleaner way to for setting mux code, following Benoît's suggestion. > > arch/arm/imx-common/iomux-v3.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c > index 9b9cf58..228d5f8 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); >
Acked-by: Stefano Babic <[email protected]> Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] ===================================================================== _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
