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

Commit 810ac2a1 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent c8f27e97

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

+22 −8
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#include "common.h"

#include "mmc.h"



#include "soc.h"

#include "mux.h"

#include "gpmc-onenand.h"
@@ -597,6 +597,7 @@ static void __init n8x0_mmc_init(void) 
	}



	mmc_data[0] = &mmc1_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));

	if (!of_have_populated_dt()) {

		board_serial_init();

		omap_sdrc_init(NULL, NULL);

	gpmc_onenand_init(board_onenand_data);

	n8x0_mmc_init();

	n8x0_usb_init();

	n8x0_cbus_init();

	}

}



MACHINE_START(NOKIA_N800, "Nokia N800")