Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e134fb2b authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 4bd597b6

arch/arm/mach-mx3/mach-cpuimx35.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -156,7 +156,7 @@ __setup("otg_mode=", eukrea_cpuimx35_otg_mode); 
/*

/*

 * Board specific initialization.

 * 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,

	mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx35_pads,

			ARRAY_SIZE(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_ext3_fs = imx35_init_early,

	.init_irq = mx35_init_irq,

	.init_irq = mx35_init_irq,

	.timer = &eukrea_cpuimx35_timer,

	.timer = &eukrea_cpuimx35_timer,

	.init_machine = mxc_board_init,

	.init_machine = eukrea_cpuimx35_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-mx3/mach-kzm_arm11_01.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -269,10 +269,6 @@ 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")

MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.map_io = kzm_map_io,

	.map_io = kzm_map_io,

arch/arm/mach-mx3/mach-mx31_3ds.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -327,10 +327,7 @@ static const struct imxuart_platform_data uart_pdata __initconst = { 
	.flags = IMXUART_HAVE_RTSCTS,

	.flags = IMXUART_HAVE_RTSCTS,

};

};





/*!

static void __init mx31_3ds_init(void)

 * Board specific initialization.

 */

static void __init mxc_board_init(void)

{

{

	mxc_iomux_setup_multiple_pins(mx31_3ds_pins, ARRAY_SIZE(mx31_3ds_pins),

	mxc_iomux_setup_multiple_pins(mx31_3ds_pins, ARRAY_SIZE(mx31_3ds_pins),

				      "mx31_3ds");

				      "mx31_3ds");
@@ -385,5 +382,5 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") 
	.init_early = imx31_init_early,

	.init_early = imx31_init_early,

	.init_irq = mx31_init_irq,

	.init_irq = mx31_init_irq,

	.timer = &mx31_3ds_timer,

	.timer = &mx31_3ds_timer,

	.init_machine = mxc_board_init,

	.init_machine = mx31_3ds_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-mx3/mach-mx31ads.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -524,10 +524,7 @@ static void __init mx31ads_init_irq(void) 
	mx31ads_init_expio();

	mx31ads_init_expio();

}

}





/*!

static void __init mx31ads_init(void)

 * Board specific initialization.

 */

static void __init mxc_board_init(void)

{

{

	mxc_init_extuart();

	mxc_init_extuart();

	mxc_init_imx_uart();

	mxc_init_imx_uart();
@@ -555,5 +552,5 @@ MACHINE_START(MX31ADS, "Freescale MX31ADS") 
	.init_early = imx31_init_early,

	.init_early = imx31_init_early,

	.init_irq = mx31ads_init_irq,

	.init_irq = mx31ads_init_irq,

	.timer = &mx31ads_timer,

	.timer = &mx31ads_timer,

	.init_machine = mxc_board_init,

	.init_machine = mx31ads_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-mx3/mach-mx31lite.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -229,7 +229,7 @@ void __init mx31lite_map_io(void) 
static int mx31lite_baseboard;

static int mx31lite_baseboard;

core_param(mx31lite_baseboard, mx31lite_baseboard, int, 0444);

core_param(mx31lite_baseboard, mx31lite_baseboard, int, 0444);





static void __init mxc_board_init(void)

static void __init mx31lite_init(void)

{

{

	int ret;

	int ret;
@@ -288,5 +288,5 @@ MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM") 
	.init_early = imx31_init_early,

	.init_early = imx31_init_early,

	.init_irq = mx31_init_irq,

	.init_irq = mx31_init_irq,

	.timer = &mx31lite_timer,

	.timer = &mx31lite_timer,

	.init_machine = mxc_board_init,

	.init_machine = mx31lite_init,

MACHINE_END
 
MACHINE_END