diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-25 15:17:10 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 15:31:17 -0800 |
| commit | 810ac2a1102880b6c66dc2f26979a896b2d84009 (patch) | |
| tree | 3862f844c8fa08dddcc401020dcfc9eb99a7ca9e /arch/arm/mach-omap2/board-n8x0.c | |
| parent | c8f27e977310b3684ff9245a94aad55d0ee27c9f (diff) | |
ARM: OMAP2+: Make n8x0 behave better with device tree based booting
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-n8x0.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-n8x0.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index d61a00dba419..c9eef2b9b86f 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -32,7 +32,7 @@ #include "common.h" #include "mmc.h" - +#include "soc.h" #include "mux.h" #include "gpmc-onenand.h" @@ -597,7 +597,8 @@ static void __init n8x0_mmc_init(void) } mmc_data[0] = &mmc1_data; - omap242x_init_mmc(mmc_data); + if (!of_have_populated_dt()) + omap242x_init_mmc(mmc_data); } #else @@ -730,6 +731,21 @@ static inline void board_serial_init(void) #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) { board_check_revision(); @@ -743,12 +759,10 @@ static void __init n8x0_init_machine(void) if (board_is_n810()) i2c_register_board_info(2, n810_i2c_board_info_2, ARRAY_SIZE(n810_i2c_board_info_2)); - board_serial_init(); - omap_sdrc_init(NULL, NULL); - gpmc_onenand_init(board_onenand_data); - n8x0_mmc_init(); - n8x0_usb_init(); - n8x0_cbus_init(); + if (!of_have_populated_dt()) { + board_serial_init(); + omap_sdrc_init(NULL, NULL); + } } MACHINE_START(NOKIA_N800, "Nokia N800") |