TX6 Release 2013-04-22

[karo-tx-uboot.git] / arch / arm / imx-common / iomux-v3.c

diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
index 08fad7851c98e8d64ddc05b06b356884b3f7a75f..2831964d6de5b236a297f1e78623a4002b9ccf0b 100644 (file)
--- a/arch/arm/imx-common/iomux-v3.c
+++ b/arch/arm/imx-common/iomux-v3.c
@@ -48,7 +48,7 @@ int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
        if (sel_input_ofs)
                __raw_writel(sel_input, base + sel_input_ofs);
 
-       if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
+       if ((pad & PAD_CTRL_VALID) && pad_ctrl_ofs)
                __raw_writel(pad_ctrl, base + pad_ctrl_ofs);
 
        return 0;
@@ -62,6 +62,21 @@ int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
        int ret;
 
        for (i = 0; i < count; i++) {
+#if 0
+               u32 mux_ctrl_ofs = (*p & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
+               u32 mux_mode = (*p & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
+               u32 sel_input_ofs =
+                       (*p & MUX_SEL_INPUT_OFS_MASK) >> MUX_SEL_INPUT_OFS_SHIFT;
+               u32 sel_input =
+                       (*p & MUX_SEL_INPUT_MASK) >> MUX_SEL_INPUT_SHIFT;
+               u32 pad_ctrl_ofs =
+                       (*p & MUX_PAD_CTRL_OFS_MASK) >> MUX_PAD_CTRL_OFS_SHIFT;
+               u32 pad_ctrl = (*p & MUX_PAD_CTRL_MASK) >> MUX_PAD_CTRL_SHIFT;
+
+               printf("PAD[%2d]=%016llx mux[%03x]=%02x pad[%03x]=%05x%c inp[%03x]=%d\n",
+                       i, *p, mux_ctrl_ofs, mux_mode, pad_ctrl_ofs, pad_ctrl,
+                       *p & PAD_CTRL_VALID ? ' ' : '!', sel_input_ofs, sel_input);
+#endif
                ret = imx_iomux_v3_setup_pad(*p);
                if (ret)
                        return ret;