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

Commit 29ee506d authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c 



Move at91rm9200_idle() along with at91sam9_idle() in clk/at91/pmc.c.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarMichael Turquette <mturquette@linaro.org>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 0be0b8cd

arch/arm/mach-at91/at91rm9200.c

+0 −9
Original line number Diff line number Diff line
@@ -21,14 +21,6 @@ 
#include "soc.h"

#include "generic.h"



static void at91rm9200_idle(void)

{

	/*

	 * Disable the processor clock.  The processor will be automatically

	 * re-enabled by an interrupt or by a reset.

	 */

	at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);

}



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

{
@@ -49,7 +41,6 @@ static void __init at91rm9200_initialize(void) 
	arm_pm_restart = at91rm9200_restart;

}





AT91_SOC_START(at91rm9200)

	.init = at91rm9200_initialize,

AT91_SOC_END

arch/arm/mach-at91/generic.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ extern void __init at91_dt_initialize(void); 
extern void at91rm9200_timer_init(void);



/* idle */

extern void at91rm9200_idle(void);

extern void at91sam9_idle(void);



/* Matrix */

drivers/clk/at91/pmc.c

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,15 @@ 
void __iomem *at91_pmc_base;

EXPORT_SYMBOL_GPL(at91_pmc_base);



void at91rm9200_idle(void)

{

	/*

	 * Disable the processor clock.  The processor will be automatically

	 * re-enabled by an interrupt or by a reset.

	 */

	at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);

}



void at91sam9_idle(void)

{

	at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);