V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

arm: imx: Change iomux functions to void type 

They never return anything also than 0, so lets change the function
to void instead.

Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Stefan Roese 2013-04-10 23:06:46 +00:00 committed by Stefano Babic
parent 8b360c0627
commit 59efa051cd
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/imx-common/iomux-v3.c
View File

@ -30,7 +30,7 @@ static void *base = (void *)IOMUXC_BASE_ADDR;
/* /*
* configures a single pad in the iomuxer * 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_ctrl_ofs = (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
u32 mux_mode = (pad & MUX_MODE_MASK) >> MUX_MODE_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) if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
__raw_writel(pad_ctrl, base + 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, void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
unsigned count) unsigned count)
{ {
iomux_v3_cfg_t const *p = pad_list; iomux_v3_cfg_t const *p = pad_list;
int i; int i;
int ret;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++)
ret = imx_iomux_v3_setup_pad(*p); imx_iomux_v3_setup_pad(*p++);
if (ret)
return ret;
p++;
}
return 0;
} }

4
arch/arm/include/asm/imx-common/iomux-v3.h
View File

@ -97,8 +97,8 @@ typedef u64 iomux_v3_cfg_t;
#define MUX_CONFIG_SION (0x1 << 4) #define MUX_CONFIG_SION (0x1 << 4)
int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad); void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad);
int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list, void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
unsigned count); unsigned count);
#endif /* __MACH_IOMUX_V3_H__*/ #endif /* __MACH_IOMUX_V3_H__*/