diff options
author | Paul Walmsley <paul@pwsan.com> | 2009-09-03 13:14:02 -0400 |
---|---|---|
committer | paul <paul@twilight.(none)> | 2009-09-03 13:14:02 -0400 |
commit | b3c6df3ab2b17cd7ddf927d39a64f235b25ac8d4 (patch) | |
tree | 58d26a0b0dc5dc597519260ef04f8bff67cc4f8c /arch/arm/mach-omap2/board-3430sdp.c | |
parent | 71348bcaac6f4c372525d4d62e88a82a7330435b (diff) |
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: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-3430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 7e9b76cc7675..4500e7f674d7 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
@@ -167,13 +167,6 @@ static struct platform_device *sdp3430_devices[] __initdata = { | |||
167 | &sdp3430_lcd_device, | 167 | &sdp3430_lcd_device, |
168 | }; | 168 | }; |
169 | 169 | ||
170 | static void __init omap_3430sdp_init_irq(void) | ||
171 | { | ||
172 | omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL); | ||
173 | omap_init_irq(); | ||
174 | omap_gpio_init(); | ||
175 | } | ||
176 | |||
177 | static struct omap_lcd_config sdp3430_lcd_config __initdata = { | 170 | static struct omap_lcd_config sdp3430_lcd_config __initdata = { |
178 | .ctrl_name = "internal", | 171 | .ctrl_name = "internal", |
179 | }; | 172 | }; |
@@ -182,6 +175,15 @@ static struct omap_board_config_kernel sdp3430_config[] __initdata = { | |||
182 | { OMAP_TAG_LCD, &sdp3430_lcd_config }, | 175 | { OMAP_TAG_LCD, &sdp3430_lcd_config }, |
183 | }; | 176 | }; |
184 | 177 | ||
178 | static void __init omap_3430sdp_init_irq(void) | ||
179 | { | ||
180 | omap_board_config = sdp3430_config; | ||
181 | omap_board_config_size = ARRAY_SIZE(sdp3430_config); | ||
182 | omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL); | ||
183 | omap_init_irq(); | ||
184 | omap_gpio_init(); | ||
185 | } | ||
186 | |||
185 | static int sdp3430_batt_table[] = { | 187 | static int sdp3430_batt_table[] = { |
186 | /* 0 C*/ | 188 | /* 0 C*/ |
187 | 30800, 29500, 28300, 27100, | 189 | 30800, 29500, 28300, 27100, |
@@ -477,8 +479,6 @@ static void __init omap_3430sdp_init(void) | |||
477 | { | 479 | { |
478 | omap3430_i2c_init(); | 480 | omap3430_i2c_init(); |
479 | platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices)); | 481 | platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices)); |
480 | omap_board_config = sdp3430_config; | ||
481 | omap_board_config_size = ARRAY_SIZE(sdp3430_config); | ||
482 | if (omap_rev() > OMAP3430_REV_ES1_0) | 482 | if (omap_rev() > OMAP3430_REV_ES1_0) |
483 | ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2; | 483 | ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2; |
484 | else | 484 | else |