OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: mx3+mx5: rename mxc_board_init to ${machine}_init 

mxc_board_init is too generic to be useful.  Additionally change some
mxc_timer to ${machine}_timer, too.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2011-02-11 10:23:19 +01:00 committed by Sascha Hauer
parent 4bd597b633
commit e134fb2b40
13 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-mx3/mach-cpuimx35.c
View File

@ -156,7 +156,7 @@ __setup("otg_mode=", eukrea_cpuimx35_otg_mode);
/*
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init eukrea_cpuimx35_init(void)
{
mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx35_pads,
ARRAY_SIZE(eukrea_cpuimx35_pads));
@ -199,5 +199,5 @@ MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
.init_ext3_fs = imx35_init_early,
.init_irq = mx35_init_irq,
.timer = &eukrea_cpuimx35_timer,
.init_machine = mxc_board_init,
.init_machine = eukrea_cpuimx35_init,
MACHINE_END

6
arch/arm/mach-mx3/mach-kzm_arm11_01.c
View File

@ -266,13 +266,9 @@ static void __init kzm_timer_init(void)
}
static struct sys_timer kzm_timer = {
.init = kzm_timer_init,
.init = kzm_timer_init,
};
/*
* The following uses standard kernel macros define in arch.h in order to
* initialize __mach_desc_KZM_ARM11_01 data structure.
*/
MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")
.boot_params = MX3x_PHYS_OFFSET + 0x100,
.map_io = kzm_map_io,

7
arch/arm/mach-mx3/mach-mx31_3ds.c
View File

@ -327,10 +327,7 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};
/*!
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init mx31_3ds_init(void)
{
mxc_iomux_setup_multiple_pins(mx31_3ds_pins, ARRAY_SIZE(mx31_3ds_pins),
"mx31_3ds");
@ -385,5 +382,5 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")
.init_early = imx31_init_early,
.init_irq = mx31_init_irq,
.timer = &mx31_3ds_timer,
.init_machine = mxc_board_init,
.init_machine = mx31_3ds_init,
MACHINE_END

7
arch/arm/mach-mx3/mach-mx31ads.c
View File

@ -524,10 +524,7 @@ static void __init mx31ads_init_irq(void)
mx31ads_init_expio();
}
/*!
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init mx31ads_init(void)
{
mxc_init_extuart();
mxc_init_imx_uart();
@ -555,5 +552,5 @@ MACHINE_START(MX31ADS, "Freescale MX31ADS")
.init_early = imx31_init_early,
.init_irq = mx31ads_init_irq,
.timer = &mx31ads_timer,
.init_machine = mxc_board_init,
.init_machine = mx31ads_init,
MACHINE_END

4
arch/arm/mach-mx3/mach-mx31lite.c
View File

@ -229,7 +229,7 @@ void __init mx31lite_map_io(void)
static int mx31lite_baseboard;
core_param(mx31lite_baseboard, mx31lite_baseboard, int, 0444);
static void __init mxc_board_init(void)
static void __init mx31lite_init(void)
{
int ret;
@ -288,5 +288,5 @@ MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM")
.init_early = imx31_init_early,
.init_irq = mx31_init_irq,
.timer = &mx31lite_timer,
.init_machine = mxc_board_init,
.init_machine = mx31lite_init,
MACHINE_END

4
arch/arm/mach-mx3/mach-mx31moboard.c
View File

@ -507,7 +507,7 @@ core_param(mx31moboard_baseboard, mx31moboard_baseboard, int, 0444);
/*
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init mx31moboard_init(void)
{
mxc_iomux_setup_multiple_pins(moboard_pins, ARRAY_SIZE(moboard_pins),
"moboard");
@ -573,5 +573,5 @@ MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")
.init_early = imx31_init_early,
.init_irq = mx31_init_irq,
.timer = &mx31moboard_timer,
.init_machine = mxc_board_init,
.init_machine = mx31moboard_init,
MACHINE_END

4
arch/arm/mach-mx3/mach-mx35_3ds.c
View File

@ -166,7 +166,7 @@ __setup("otg_mode=", mx35_3ds_otg_mode);
/*
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init mx35_3ds_init(void)
{
mxc_iomux_v3_setup_multiple_pads(mx35pdk_pads, ARRAY_SIZE(mx35pdk_pads));
@ -208,5 +208,5 @@ MACHINE_START(MX35_3DS, "Freescale MX35PDK")
.init_early = imx35_init_early,
.init_irq = mx35_init_irq,
.timer = &mx35pdk_timer,
.init_machine = mxc_board_init,
.init_machine = mx35_3ds_init,
MACHINE_END

4
arch/arm/mach-mx3/mach-pcm037.c
View File

@ -578,7 +578,7 @@ __setup("otg_mode=", pcm037_otg_mode);
/*
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init pcm037_init(void)
{
int ret;
@ -690,5 +690,5 @@ MACHINE_START(PCM037, "Phytec Phycore pcm037")
.init_early = imx31_init_early,
.init_irq = mx31_init_irq,
.timer = &pcm037_timer,
.init_machine = mxc_board_init,
.init_machine = pcm037_init,
MACHINE_END

4
arch/arm/mach-mx3/mach-pcm043.c
View File

@ -351,7 +351,7 @@ __setup("otg_mode=", pcm043_otg_mode);
/*
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init pcm043_init(void)
{
mxc_iomux_v3_setup_multiple_pads(pcm043_pads, ARRAY_SIZE(pcm043_pads));
@ -418,5 +418,5 @@ MACHINE_START(PCM043, "Phytec Phycore pcm043")
.init_early = imx35_init_early,
.init_irq = mx35_init_irq,
.timer = &pcm043_timer,
.init_machine = mxc_board_init,
.init_machine = pcm043_init,
MACHINE_END

4
arch/arm/mach-mx3/mach-qong.c
View File

@ -247,7 +247,7 @@ static void __init qong_init_fpga(void)
/*
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init qong_init(void)
{
mxc_init_imx_uart();
qong_init_nor_mtd();
@ -275,5 +275,5 @@ MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
.init_early = imx31_init_early,
.init_irq = mx31_init_irq,
.timer = &qong_timer,
.init_machine = mxc_board_init,
.init_machine = qong_init,
MACHINE_END

10
arch/arm/mach-mx5/board-mx51_3ds.c
View File

@ -133,7 +133,7 @@ static struct spi_board_info mx51_3ds_spi_nor_device[] = {
/*
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init mx51_3ds_init(void)
{
mxc_iomux_v3_setup_multiple_pads(mx51_3ds_pads,
ARRAY_SIZE(mx51_3ds_pads));
@ -160,8 +160,8 @@ static void __init mx51_3ds_timer_init(void)
mx51_clocks_init(32768, 24000000, 22579200, 0);
}
static struct sys_timer mxc_timer = {
.init = mx51_3ds_timer_init,
static struct sys_timer mx51_3ds_timer = {
.init = mx51_3ds_timer_init,
};
MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board")
@ -170,6 +170,6 @@ MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board")
.map_io = mx51_map_io,
.init_early = imx51_init_early,
.init_irq = mx51_init_irq,
.timer = &mxc_timer,
.init_machine = mxc_board_init,
.timer = &mx51_3ds_timer,
.init_machine = mx51_3ds_init,
MACHINE_END

10
arch/arm/mach-mx5/board-mx51_babbage.c
View File

@ -341,7 +341,7 @@ static const struct spi_imx_master mx51_babbage_spi_pdata __initconst = {
/*
* Board specific initialization.
*/
static void __init mxc_board_init(void)
static void __init mx51_babbage_init(void)
{
iomux_v3_cfg_t usbh1stp = MX51_PAD_USBH1_STP__USBH1_STP;
iomux_v3_cfg_t power_key = _MX51_PAD_EIM_A27__GPIO2_21 |
@ -395,8 +395,8 @@ static void __init mx51_babbage_timer_init(void)
mx51_clocks_init(32768, 24000000, 22579200, 0);
}
static struct sys_timer mxc_timer = {
.init = mx51_babbage_timer_init,
static struct sys_timer mx51_babbage_timer = {
.init = mx51_babbage_timer_init,
};
MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
@ -405,6 +405,6 @@ MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
.map_io = mx51_map_io,
.init_early = imx51_init_early,
.init_irq = mx51_init_irq,
.timer = &mxc_timer,
.init_machine = mxc_board_init,
.timer = &mx51_babbage_timer,
.init_machine = mx51_babbage_init,
MACHINE_END

10
arch/arm/mach-mx5/board-mx51_efikamx.c
View File

@ -303,7 +303,7 @@ void mx51_efikamx_reset(void)
gpio_direction_output(EFIKAMX_RESET, 0);
}
static void __init mxc_board_init(void)
static void __init mx51_efikamx_init(void)
{
mxc_iomux_v3_setup_multiple_pads(mx51efikamx_pads,
ARRAY_SIZE(mx51efikamx_pads));
@ -341,8 +341,8 @@ static void __init mx51_efikamx_timer_init(void)
mx51_clocks_init(32768, 24000000, 22579200, 24576000);
}
static struct sys_timer mxc_timer = {
.init = mx51_efikamx_timer_init,
static struct sys_timer mx51_efikamx_timer = {
.init = mx51_efikamx_timer_init,
};
MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
@ -351,6 +351,6 @@ MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
.map_io = mx51_map_io,
.init_early = imx51_init_early,
.init_irq = mx51_init_irq,
.timer = &mxc_timer,
.init_machine = mxc_board_init,
.timer = &mx51_efikamx_timer,
.init_machine = mx51_efikamx_init,
MACHINE_END