summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/imx-common
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2013-04-26 01:34:46 +0000
committerStefano Babic <sbabic@denx.de>2013-04-28 11:15:07 +0200
commit246952083a4b48c8f8ee463eb694828a309f19b5 (patch)
tree1dda9b82c70287157f43dad6185e12210713cd55 /arch/arm/include/asm/imx-common
parent79a34d3ccc7bb08848412877b6935e596fef1d29 (diff)
downloadtalos-obmc-uboot-246952083a4b48c8f8ee463eb694828a309f19b5.tar.gz
talos-obmc-uboot-246952083a4b48c8f8ee463eb694828a309f19b5.zip
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 <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'arch/arm/include/asm/imx-common')
-rw-r--r--arch/arm/include/asm/imx-common/iomux-v3.h3
1 files changed, 3 insertions, 0 deletions
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
OpenPOWER on IntegriCloud