From: Benoît Thébaudeau Date: Fri, 26 Apr 2013 01:34:46 +0000 (+0000) Subject: imx: iomux-v3: Restore Linux's NEW_PAD_CTRL() macro X-Git-Tag: v2013.07-rc1~85^2~51 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=246952083a4b48c8f8ee463eb694828a309f19b5;p=u-boot imx: iomux-v3: Restore Linux's NEW_PAD_CTRL() macro This macro will be useful for future changes. Signed-off-by: Benoît Thébaudeau --- diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index 6b58381178..2ba0a053de 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -86,6 +86,9 @@ typedef u64 iomux_v3_cfg_t; ((iomux_v3_cfg_t)(sel_input_ofs) << MUX_SEL_INPUT_OFS_SHIFT)| \ ((iomux_v3_cfg_t)(sel_input) << MUX_SEL_INPUT_SHIFT)) +#define NEW_PAD_CTRL(cfg, pad) (((cfg) & ~MUX_PAD_CTRL_MASK) | \ + MUX_PAD_CTRL(pad)) + #define __NA_ 0x000 #define NO_MUX_I 0 #define NO_PAD_I 0