omap4: Allow omap_serial_early_init() for OMAP4430 board (5b7815b5) · Commits · 戴 / test

This patch enables omap_serial_early_init() function for OMAP4430 SDP. Without this the bootup would throw oops in omap_serial_init(). Note that the ifndef CONFIG_ARCH_OMAP4 is split into two sections to enable omap_serial_early_init(). This ifndef cannot be removed until omap4 clock framework is implemented. Signed-off-by:

Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-By:

Tony Lindgren <tony@atomide.com> Reviewed-By:

Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by:

Tony Lindgren <tony@atomide.com>

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,6 +58,8 @@ static void __init gic_init_irq(void)

		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);
		#ifdef CONFIG_OMAP_32K_TIMER
		omap2_gp_clockevent_set_gptimer(1);
		@@ -70,8 +72,6 @@ static void __init omap_4430sdp_init_irq(void)
		static void __init omap_4430sdp_init(void)
		{
		platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));
		omap_board_config = sdp4430_config;
		omap_board_config_size = ARRAY_SIZE(sdp4430_config);
		omap_serial_init();
		}

arch/arm/mach-omap2/io.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -302,7 +302,9 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0,
		pwrdm_init(powerdomains_omap);
		clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps);
		omap2_clk_init();
		#endif
		omap_serial_early_init();
		#ifndef CONFIG_ARCH_OMAP4
		omap_hwmod_late_init();
		omap_pm_if_init();
		omap2_sdrc_init(sdrc_cs0, sdrc_cs1);

Admin message