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

Commit ea69f998 authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

ARM: at91: fix ordering of SRAM and PM initialization 



The PM initialization needs internal SRAM for allocating a gen_pool and
use it to store its PM code. So we need to have of_platform_populate() before
this code.

Suggested-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent b9f122cc

arch/arm/mach-at91/board-dt-rm9200.c

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ static void __init at91rm9200_dt_timer_init(void) 


static void __init rm9200_dt_device_init(void)

{

	at91_rm9200_pm_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);



	at91_rm9200_pm_init();

}

arch/arm/mach-at91/board-dt-sam9.c

+6 −6
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 


static void __init sam9_dt_device_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);



	arm_pm_idle = at91sam9_idle;

	at91_sam9260_pm_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *at91_dt_board_compat[] __initconst = {
@@ -48,10 +48,10 @@ MACHINE_END 


static void __init sam9g45_dt_device_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);



	arm_pm_idle = at91sam9_idle;

	at91_sam9g45_pm_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *at91_9g45_board_compat[] __initconst = {
@@ -69,10 +69,10 @@ MACHINE_END 


static void __init sam9x5_dt_device_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);



	arm_pm_idle = at91sam9_idle;

	at91_sam9x5_pm_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *at91_9x5_board_compat[] __initconst = {

arch/arm/mach-at91/board-dt-sama5.c

+1 −1
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 


static void __init sama5_dt_device_init(void)

{

	at91_sam9x5_pm_init();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	at91_sam9x5_pm_init();

}



static const char *sama5_dt_board_compat[] __initconst = {