aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-01-15 09:59:31 -0500
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-01-16 12:08:42 -0500
commit29ee506d0d56f6d39cc237de2512f9cb5629cbf7 (patch)
tree462f50bbdf5fa73d202bccff720516c4809dabe4
parent0be0b8cd49f22037096ad41b831a93dd8d0d4f87 (diff)
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: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Michael Turquette <mturquette@linaro.org> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r--arch/arm/mach-at91/at91rm9200.c9
-rw-r--r--arch/arm/mach-at91/generic.h1
-rw-r--r--drivers/clk/at91/pmc.c9
3 files changed, 10 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index fc7c26138037..3be1963f5c56 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -21,14 +21,6 @@
21#include "soc.h" 21#include "soc.h"
22#include "generic.h" 22#include "generic.h"
23 23
24static void at91rm9200_idle(void)
25{
26 /*
27 * Disable the processor clock. The processor will be automatically
28 * re-enabled by an interrupt or by a reset.
29 */
30 at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);
31}
32 24
33static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd) 25static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd)
34{ 26{
@@ -49,7 +41,6 @@ static void __init at91rm9200_initialize(void)
49 arm_pm_restart = at91rm9200_restart; 41 arm_pm_restart = at91rm9200_restart;
50} 42}
51 43
52
53AT91_SOC_START(at91rm9200) 44AT91_SOC_START(at91rm9200)
54 .init = at91rm9200_initialize, 45 .init = at91rm9200_initialize,
55AT91_SOC_END 46AT91_SOC_END
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index 1823a779182d..44fc725edcf1 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -25,6 +25,7 @@ extern void __init at91_dt_initialize(void);
25extern void at91rm9200_timer_init(void); 25extern void at91rm9200_timer_init(void);
26 26
27/* idle */ 27/* idle */
28extern void at91rm9200_idle(void);
28extern void at91sam9_idle(void); 29extern void at91sam9_idle(void);
29 30
30/* Matrix */ 31/* Matrix */
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 386999b4f8eb..f07c8152e5cc 100644
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -27,6 +27,15 @@
27void __iomem *at91_pmc_base; 27void __iomem *at91_pmc_base;
28EXPORT_SYMBOL_GPL(at91_pmc_base); 28EXPORT_SYMBOL_GPL(at91_pmc_base);
29 29
30void at91rm9200_idle(void)
31{
32 /*
33 * Disable the processor clock. The processor will be automatically
34 * re-enabled by an interrupt or by a reset.
35 */
36 at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);
37}
38
30void at91sam9_idle(void) 39void at91sam9_idle(void)
31{ 40{
32 at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK); 41 at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);