git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
iomux-v3.h
diff --git
a/arch/arm/plat-mxc/include/mach/iomux-v3.h
b/arch/arm/plat-mxc/include/mach/iomux-v3.h
index
4509956
..
2fa3b54
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/iomux-v3.h
+++ b/
arch/arm/plat-mxc/include/mach/iomux-v3.h
@@
-80,6
+80,7
@@
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))
/*
* Use to set PAD control
*/