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

Commit 4805734b authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2+: io: split omap2_init_common_hw() 



Split omap2_init_common_hw() into two functions.  The first,
omap2_init_common_infrastructure(), initializes the hwmod code and
data, the OMAP PM code, and the clock code and data.  The second,
omap2_init_common_devices(), handles any other early device
initialization that, for whatever reason, has not been or cannot be
moved to initcalls or early platform devices.

This patch is required for the hwmod postsetup patch, which allows
board files to change the state that hwmods should be placed into at
the conclusion of the hwmod _setup() function.  For example, for a
board whose creators wish to ensure watchdog coverage across the
entire kernel boot process, code to change the watchdog's postsetup
state will be added in the board-*.c file between the
omap2_init_common_infrastructure() and omap2_init_common_devices() function
calls.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
parent b9e7683b

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

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ static void __init omap_2430sdp_init_irq(void) 
{

	omap_board_config = sdp2430_config;

	omap_board_config_size = ARRAY_SIZE(sdp2430_config);

	omap2_init_common_hw(NULL, NULL);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

	omap_init_irq();

}

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

+2 −1
Original line number Diff line number Diff line
@@ -326,7 +326,8 @@ static void __init omap_3430sdp_init_irq(void) 
	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap3_pm_init_cpuidle(omap3_cpuidle_params_table);

	omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);

	omap_init_irq();

}

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

+3 −2
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ static void __init omap_sdp_init_irq(void) 
{

	omap_board_config = sdp_config;

	omap_board_config_size = ARRAY_SIZE(sdp_config);

	omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,

	omap2_init_common_infrastructure();

	omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);

	omap_init_irq();

}

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

+2 −1
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ static void __init omap_4430sdp_init_irq(void) 
{

	omap_board_config = sdp4430_config;

	omap_board_config_size = ARRAY_SIZE(sdp4430_config);

	omap2_init_common_hw(NULL, NULL);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

#ifdef CONFIG_OMAP_32K_TIMER

	omap2_gp_clockevent_set_gptimer(1);

#endif

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

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ static void __init am3517_crane_init_irq(void) 
	omap_board_config = am3517_crane_config;

	omap_board_config_size = ARRAY_SIZE(am3517_crane_config);



	omap2_init_common_hw(NULL, NULL);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

	omap_init_irq();

}