leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: OMAP2+: Make n8x0 behave better with device tree based booting

Browse Source 
Initialize some devices using a late_initcall and test for
the device tree based booting for some devices.

This way we can keep things working for legacy platform
devices when booted with device tree.

Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2013-11-25 15:17:10 -08:00
parent c8f27e9773
commit 810ac2a110
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm/mach-omap2/board-n8x0.c
View File

@ -32,7 +32,7 @@
#include "common.h" #include "common.h"
#include "mmc.h" #include "mmc.h"
#include "soc.h"
#include "mux.h" #include "mux.h"
#include "gpmc-onenand.h" #include "gpmc-onenand.h"
@ -597,7 +597,8 @@ static void __init n8x0_mmc_init(void)
} }
mmc_data[0] = &mmc1_data; mmc_data[0] = &mmc1_data;
omap242x_init_mmc(mmc_data); if (!of_have_populated_dt())
omap242x_init_mmc(mmc_data);
} }
#else #else
@ -730,6 +731,21 @@ static inline void board_serial_init(void)
#endif #endif
static int __init n8x0_late_initcall(void)
{
if (!board_caps)
return -ENODEV;
gpmc_onenand_init(board_onenand_data);
n8x0_mmc_init();
n8x0_usb_init();
if (!of_have_populated_dt())
n8x0_cbus_init();
return 0;
}
omap_late_initcall(n8x0_late_initcall);
static void __init n8x0_init_machine(void) static void __init n8x0_init_machine(void)
{ {
board_check_revision(); board_check_revision();
@ -743,12 +759,10 @@ static void __init n8x0_init_machine(void)
if (board_is_n810()) if (board_is_n810())
i2c_register_board_info(2, n810_i2c_board_info_2, i2c_register_board_info(2, n810_i2c_board_info_2,
ARRAY_SIZE(n810_i2c_board_info_2)); ARRAY_SIZE(n810_i2c_board_info_2));
board_serial_init(); if (!of_have_populated_dt()) {
omap_sdrc_init(NULL, NULL); board_serial_init();
gpmc_onenand_init(board_onenand_data); omap_sdrc_init(NULL, NULL);
n8x0_mmc_init(); }
n8x0_usb_init();
n8x0_cbus_init();
} }
MACHINE_START(NOKIA_N800, "Nokia N800") MACHINE_START(NOKIA_N800, "Nokia N800")