merged tx6dl-devel into denx master branch

[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 b59b802830677b240af7ce915394b41a8a1a1831..fe43d872ddc715b2c36d5a4fbec0a497ee8d563a 100644 (file)
--- a/arch/arm/imx-common/iomux-v3.c
+++ b/arch/arm/imx-common/iomux-v3.c
@@ -37,11 +37,11 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
                __raw_writel(sel_input, base + sel_input_ofs);
 
 #ifdef CONFIG_IOMUX_SHARE_CONF_REG
-       if (!(pad_ctrl & NO_PAD_CTRL))
+       if (pad & PAD_CTRL_VALID)
                __raw_writel((mux_mode << PAD_MUX_MODE_SHIFT) | pad_ctrl,
                        base + pad_ctrl_ofs);
 #else
-       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);
 #endif
 }
@@ -52,6 +52,22 @@ void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
        iomux_v3_cfg_t const *p = pad_list;
        int i;
 
-       for (i = 0; i < count; i++)
+       for (i = 0; i < count; i++) {
+#ifdef DEBUG
+               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
                imx_iomux_v3_setup_pad(*p++);
+       }
 }