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

Commit b3c6df3a authored by Paul Walmsley's avatar Paul Walmsley Committed by paul
Browse files

OMAP2/3 board-*.c files: read bootloader configuration earlier 



Most board-*.c files read configuration data from the bootloader in
their .init_machine() function.  This needs to happen earlier, at some
point before omap2_init_common_hw() is called.  This is because a
future patch will use the bootloader serial console port information
to enable the UART clocks earlier, immediately after omap2_clk_init().
This is in turn necessary since otherwise clock tree usecounts on
clocks like dpll4_m2x2_ck will be bogus, which can cause the
currently-active console UART clock to be disabled during boot.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 71348bca

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

+6 −7
Original line number Diff line number Diff line
@@ -139,18 +139,19 @@ static inline void board_smc91x_init(void) 


#endif



static struct omap_board_config_kernel sdp2430_config[] = {

	{OMAP_TAG_LCD, &sdp2430_lcd_config},

};



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);

	omap_init_irq();

	omap_gpio_init();

}



static struct omap_board_config_kernel sdp2430_config[] = {

	{OMAP_TAG_LCD, &sdp2430_lcd_config},

};





static struct twl4030_gpio_platform_data sdp2430_gpio_data = {

	.gpio_base	= OMAP_MAX_GPIO_LINES,

	.irq_base	= TWL4030_GPIO_IRQ_BASE,
@@ -200,8 +201,6 @@ static void __init omap_2430sdp_init(void) 
	omap2430_i2c_init();



	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	omap_board_config = sdp2430_config;

	omap_board_config_size = ARRAY_SIZE(sdp2430_config);

	omap_serial_init();

	twl4030_mmc_init(mmc);

	usb_musb_init();

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

+9 −9
Original line number Diff line number Diff line
@@ -167,13 +167,6 @@ static struct platform_device *sdp3430_devices[] __initdata = { 
	&sdp3430_lcd_device,

};



static void __init omap_3430sdp_init_irq(void)

{

	omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);

	omap_init_irq();

	omap_gpio_init();

}



static struct omap_lcd_config sdp3430_lcd_config __initdata = {

	.ctrl_name	= "internal",

};
@@ -182,6 +175,15 @@ static struct omap_board_config_kernel sdp3430_config[] __initdata = { 
	{ OMAP_TAG_LCD,		&sdp3430_lcd_config },

};



static void __init omap_3430sdp_init_irq(void)

{

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);

	omap_init_irq();

	omap_gpio_init();

}



static int sdp3430_batt_table[] = {

/* 0 C*/

30800, 29500, 28300, 27100,
@@ -477,8 +479,6 @@ static void __init omap_3430sdp_init(void) 
{

	omap3430_i2c_init();

	platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	if (omap_rev() > OMAP3430_REV_ES1_0)

		ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2;

	else

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

+10 −10
Original line number Diff line number Diff line
@@ -248,14 +248,6 @@ static inline void __init apollon_init_smc91x(void) 
	clk_put(gpmc_fck);

}



static void __init omap_apollon_init_irq(void)

{

	omap2_init_common_hw(NULL, NULL);

	omap_init_irq();

	omap_gpio_init();

	apollon_init_smc91x();

}



static struct omap_usb_config apollon_usb_config __initdata = {

	.register_dev	= 1,

	.hmc_mode	= 0x14,	/* 0:dev 1:host1 2:disable */
@@ -271,6 +263,16 @@ static struct omap_board_config_kernel apollon_config[] = { 
	{ OMAP_TAG_LCD,		&apollon_lcd_config },

};



static void __init omap_apollon_init_irq(void)

{

	omap_board_config = apollon_config;

	omap_board_config_size = ARRAY_SIZE(apollon_config);

	omap2_init_common_hw(NULL, NULL);

	omap_init_irq();

	omap_gpio_init();

	apollon_init_smc91x();

}



static void __init apollon_led_init(void)

{

	/* LED0 - AA10 */
@@ -319,8 +321,6 @@ static void __init omap_apollon_init(void) 
	 * if not needed.

	 */

	platform_add_devices(apollon_devices, ARRAY_SIZE(apollon_devices));

	omap_board_config = apollon_config;

	omap_board_config_size = ARRAY_SIZE(apollon_config);

	omap_serial_init();

}

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

+5 −5
Original line number Diff line number Diff line
@@ -31,19 +31,19 @@ 
#include <mach/board.h>

#include <mach/common.h>



static struct omap_board_config_kernel generic_config[] = {

};



static void __init omap_generic_init_irq(void)

{

	omap_board_config = generic_config;

	omap_board_config_size = ARRAY_SIZE(generic_config);

	omap2_init_common_hw(NULL, NULL);

	omap_init_irq();

}



static struct omap_board_config_kernel generic_config[] = {

};



static void __init omap_generic_init(void)

{

	omap_board_config = generic_config;

	omap_board_config_size = ARRAY_SIZE(generic_config);

	omap_serial_init();

}

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

+10 −10
Original line number Diff line number Diff line
@@ -268,14 +268,6 @@ static void __init h4_init_flash(void) 
	h4_flash_resource.end	= base + SZ_64M - 1;

}



static void __init omap_h4_init_irq(void)

{

	omap2_init_common_hw(NULL, NULL);

	omap_init_irq();

	omap_gpio_init();

	h4_init_flash();

}



static struct omap_lcd_config h4_lcd_config __initdata = {

	.ctrl_name	= "internal",

};
@@ -317,6 +309,16 @@ static struct omap_board_config_kernel h4_config[] = { 
	{ OMAP_TAG_LCD,		&h4_lcd_config },

};



static void __init omap_h4_init_irq(void)

{

	omap_board_config = h4_config;

	omap_board_config_size = ARRAY_SIZE(h4_config);

	omap2_init_common_hw(NULL, NULL);

	omap_init_irq();

	omap_gpio_init();

	h4_init_flash();

}



static struct at24_platform_data m24c01 = {

	.byte_len	= SZ_1K / 8,

	.page_size	= 16,
@@ -361,8 +363,6 @@ static void __init omap_h4_init(void) 
			ARRAY_SIZE(h4_i2c_board_info));



	platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));

	omap_board_config = h4_config;

	omap_board_config_size = ARRAY_SIZE(h4_config);

	omap_usb_init(&h4_usb_config);

	omap_serial_init();

}