diff options
author | Stefano Babic <sbabic@denx.de> | 2013-04-21 09:32:19 (GMT) |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2013-04-21 09:32:19 (GMT) |
commit | cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4 (patch) | |
tree | 3fd9296d1c1b42ec0df3a02fa916c84729378a00 /arch/arm/imx-common/iomux-v3.c | |
parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) | |
parent | e9fd66defd7ed23e7847c418b684f42b9d427493 (diff) | |
download | u-boot-fsl-qoriq-cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4.tar.xz |
Merge branch 'next'
Diffstat (limited to 'arch/arm/imx-common/iomux-v3.c')
-rw-r--r-- | arch/arm/imx-common/iomux-v3.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index 08fad78..7fe5ce7 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -30,7 +30,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; @@ -50,22 +50,14 @@ int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs) __raw_writel(pad_ctrl, base + pad_ctrl_ofs); - - return 0; } -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++) { - ret = imx_iomux_v3_setup_pad(*p); - if (ret) - return ret; - p++; - } - return 0; + for (i = 0; i < count; i++) + imx_iomux_v3_setup_pad(*p++); } |