merged tx6dl-devel into denx master branch

[karo-tx-uboot.git] / arch / arm / include / asm / arch-mx5 / iomux-mx53.h

diff --git a/arch/arm/include/asm/arch-mx5/iomux-mx53.h b/arch/arm/include/asm/arch-mx5/iomux-mx53.h
index 1b75fd1cfd13e697a622f36dbcd102743c6afd12..bc62621ea39de7ec9c912cc37c6ae22662a8dd15 100644 (file)
--- a/arch/arm/include/asm/arch-mx5/iomux-mx53.h
+++ b/arch/arm/include/asm/arch-mx5/iomux-mx53.h
@@ -14,9 +14,9 @@
 #include <asm/imx-common/iomux-v3.h>
 
 /* Pad control groupings */
-#define MX53_UART_PAD_CTRL     (PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_HIGH | \
+#define MX53_UART_PAD_CTRL     MUX_PAD_CTRL(PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_HIGH | \
                                 PAD_CTL_SRE_FAST | PAD_CTL_HYS)
-#define MX53_SDHC_PAD_CTRL     (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \
+#define MX53_SDHC_PAD_CTRL     MUX_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \
                                 PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST)
 
 /*