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

Commit 8f5b5a41 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Introduce SoC specific early_init 



Introduce them for each omap variant and just make them all call
omap2_init_common_infrastructure for now. Do this for each board-*.c
file except for board-generic and board-omap3beagle as they use
the same machine ID for multiple SoCs.

No functional changes.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a4ca9dbe

arch/arm/mach-omap2/board-2430sdp.c

+1 −6
Original line number Diff line number Diff line
@@ -141,11 +141,6 @@ static struct omap_board_config_kernel sdp2430_config[] __initdata = { 
	{OMAP_TAG_LCD, &sdp2430_lcd_config},

};



static void __init omap_2430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

}



static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};
@@ -259,7 +254,7 @@ MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") 
	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap_2430sdp_map_io,

	.init_early	= omap_2430sdp_init_early,

	.init_early	= omap2430_init_early,

	.init_irq	= omap2_init_irq,

	.init_machine	= omap_2430sdp_init,

	.timer		= &omap2_timer,

arch/arm/mach-omap2/board-3430sdp.c

+1 −6
Original line number Diff line number Diff line
@@ -225,11 +225,6 @@ static struct omap_dss_board_info sdp3430_dss_data = { 
static struct omap_board_config_kernel sdp3430_config[] __initdata = {

};



static void __init omap_3430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

}



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,
@@ -732,7 +727,7 @@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board") 
	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap_3430sdp_init_early,

	.init_early	= omap3430_init_early,

	.init_irq	= omap3_init_irq,

	.init_machine	= omap_3430sdp_init,

	.timer		= &omap3_timer,

arch/arm/mach-omap2/board-3630sdp.c

+1 −6
Original line number Diff line number Diff line
@@ -70,11 +70,6 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = { 
static struct omap_board_config_kernel sdp_config[] __initdata = {

};



static void __init omap_sdp_init_early(void)

{

	omap2_init_common_infrastructure();

}



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },
@@ -218,7 +213,7 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") 
	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap_sdp_init_early,

	.init_early	= omap3630_init_early,

	.init_irq	= omap3_init_irq,

	.init_machine	= omap_sdp_init,

	.timer		= &omap3_timer,

arch/arm/mach-omap2/board-4430sdp.c

+1 −6
Original line number Diff line number Diff line
@@ -389,11 +389,6 @@ static struct omap_board_config_kernel sdp4430_config[] __initdata = { 
	{ OMAP_TAG_LCD,		&sdp4430_lcd_config },

};



static void __init omap_4430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

}



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_UTMI,

	.mode			= MUSB_OTG,
@@ -841,7 +836,7 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board") 
	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap_4430sdp_map_io,

	.init_early	= omap_4430sdp_init_early,

	.init_early	= omap4430_init_early,

	.init_irq	= gic_init_irq,

	.init_machine	= omap_4430sdp_init,

	.timer		= &omap4_timer,

arch/arm/mach-omap2/board-am3517crane.c

+1 −6
Original line number Diff line number Diff line
@@ -47,11 +47,6 @@ static struct omap_board_mux board_mux[] __initdata = { 
};

#endif



static void __init am3517_crane_init_early(void)

{

	omap2_init_common_infrastructure();

}



static struct usbhs_omap_board_data usbhs_bdata __initdata = {

	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
@@ -101,7 +96,7 @@ MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD") 
	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= am3517_crane_init_early,

	.init_early	= am35xx_init_early,

	.init_irq	= omap3_init_irq,

	.init_machine	= am3517_crane_init,

	.timer		= &omap3_timer,