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

Commit 7d7ffd7b authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: at91rm9200: set idle and restart from rm9200_dt_device_init() 



Setup arm_pm_idle and arm_pm_restart function pointers from
rm9200_dt_device_init() function to simplify the at91rm9200 initialization
process.
This same move is already done for the sam9s.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: adapt patch to newer series]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 980657d8

arch/arm/mach-at91/at91rm9200.c

+0 −14
Original line number Original line Diff line number Diff line
@@ -22,25 +22,11 @@ 
#include "generic.h"

#include "generic.h"









static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd)

{

	/*

	 * Perform a hardware reset with the use of the Watchdog timer.

	 */

	at91_st_write(AT91_ST_WDMR, AT91_ST_RSTEN | AT91_ST_EXTEN | 1);

	at91_st_write(AT91_ST_CR, AT91_ST_WDRST);

}





/* --------------------------------------------------------------------

/* --------------------------------------------------------------------

 *  AT91RM9200 processor initialization

 *  AT91RM9200 processor initialization

 * -------------------------------------------------------------------- */

 * -------------------------------------------------------------------- */





static void __init at91rm9200_initialize(void)

{

	arm_pm_idle = at91rm9200_idle;

	arm_pm_restart = at91rm9200_restart;

}





AT91_SOC_START(at91rm9200)

AT91_SOC_START(at91rm9200)

	.init = at91rm9200_initialize,

AT91_SOC_END
 
AT91_SOC_END

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

+14 −0
Original line number Original line Diff line number Diff line
@@ -22,9 +22,21 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>

#include <asm/mach/irq.h>

#include <asm/mach/irq.h>

#include <asm/system_misc.h>



#include <mach/at91_st.h>





#include "generic.h"

#include "generic.h"





static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd)

{

	/*

	 * Perform a hardware reset with the use of the Watchdog timer.

	 */

	at91_st_write(AT91_ST_WDMR, AT91_ST_RSTEN | AT91_ST_EXTEN | 1);

	at91_st_write(AT91_ST_CR, AT91_ST_WDRST);

}



static void __init at91rm9200_dt_timer_init(void)

static void __init at91rm9200_dt_timer_init(void)

{

{

	of_clk_init(NULL);

	of_clk_init(NULL);
@@ -35,6 +47,8 @@ static void __init rm9200_dt_device_init(void) 
{

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);





	arm_pm_idle = at91rm9200_idle;

	arm_pm_restart = at91rm9200_restart;

	at91_rm9200_pm_init();

	at91_rm9200_pm_init();

}

}