Update from 2013.01 to 2013.07

[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 2831964d6de5b236a297f1e78623a4002b9ccf0b..fe43d872ddc715b2c36d5a4fbec0a497ee8d563a 100644 (file)
--- a/arch/arm/imx-common/iomux-v3.c
+++ b/arch/arm/imx-common/iomux-v3.c
@@ -6,19 +6,7 @@
  *
  * Copyright (C) 2004-2011 Freescale Semiconductor, Inc.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <asm/io.h>
@@ -30,7 +18,7 @@ static void *base = (void *)IOMUXC_BASE_ADDR;
 /*
  * configures a single pad in the iomuxer
  */
-int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
+void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
 {
        u32 mux_ctrl_ofs = (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
        u32 mux_mode = (pad & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
@@ -48,21 +36,24 @@ int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
        if (sel_input_ofs)
                __raw_writel(sel_input, base + sel_input_ofs);
 
+#ifdef CONFIG_IOMUX_SHARE_CONF_REG
+       if (pad & PAD_CTRL_VALID)
+               __raw_writel((mux_mode << PAD_MUX_MODE_SHIFT) | pad_ctrl,
+                       base + pad_ctrl_ofs);
+#else
        if ((pad & PAD_CTRL_VALID) && pad_ctrl_ofs)
                __raw_writel(pad_ctrl, base + pad_ctrl_ofs);
-
-       return 0;
+#endif
 }
 
-int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
-                                    unsigned count)
+void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
+                                     unsigned count)
 {
        iomux_v3_cfg_t const *p = pad_list;
        int i;
-       int ret;
 
        for (i = 0; i < count; i++) {
-#if 0
+#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 =
@@ -77,10 +68,6 @@ int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
                        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;
-               p++;
+               imx_iomux_v3_setup_pad(*p++);
        }
-       return 0;
 }