diff mbox

[U-Boot,3/4] imx: iomux-v3: Restore Linux's NEW_PAD_CTRL() macro

Message ID 1366976088-30499-3-git-send-email-benoit.thebaudeau@advansee.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Benoît Thébaudeau April 26, 2013, 11:34 a.m. UTC 
This macro will be useful for future changes.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
---
 arch/arm/include/asm/imx-common/iomux-v3.h |    3 +++
 1 file changed, 3 insertions(+)

Comments

Stefano Babic April 28, 2013, 9:21 a.m. UTC | #1 
On 26/04/2013 13:34, Benoît Thébaudeau wrote:
> This macro will be useful for future changes.
> 
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> ---
>  arch/arm/include/asm/imx-common/iomux-v3.h |    3 +++
>  1 file changed, 3 insertions(+)
> 
Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
index 6b58381..2ba0a05 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