aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-01-15 16:58:07 -0500
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-01-26 07:43:34 -0500
commit4fe604c8b3657c63354fef196509c1596058d9f2 (patch)
treebe2094147e3d855d6c097d783091451e06a56654 /arch/arm/mach-at91
parent37e9c4d947dedd74d6ce1488a3baac42349b7323 (diff)
ARM: at91: fix sam9n12 and sam9x5 arm_pm_idle
sam9n12 and sam9x5 don't set arm_pm_idle because of an oversight, fix that. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r--arch/arm/mach-at91/at91sam9n12.c5
-rw-r--r--arch/arm/mach-at91/at91sam9x5.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
index b5ea69a3eaf6..276b8f0e4183 100644
--- a/arch/arm/mach-at91/at91sam9n12.c
+++ b/arch/arm/mach-at91/at91sam9n12.c
@@ -15,6 +15,11 @@
15/* -------------------------------------------------------------------- 15/* --------------------------------------------------------------------
16 * AT91SAM9N12 processor initialization 16 * AT91SAM9N12 processor initialization
17 * -------------------------------------------------------------------- */ 17 * -------------------------------------------------------------------- */
18static void __init at91sam9n12_initialize(void)
19{
20 arm_pm_idle = at91sam9_idle;
21}
18 22
19AT91_SOC_START(at91sam9n12) 23AT91_SOC_START(at91sam9n12)
24 .init = at91sam9n12_initialize,
20AT91_SOC_END 25AT91_SOC_END
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index 7b60a529db01..7b6fb1bca505 100644
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -16,5 +16,11 @@
16 * AT91SAM9x5 processor initialization 16 * AT91SAM9x5 processor initialization
17 * -------------------------------------------------------------------- */ 17 * -------------------------------------------------------------------- */
18 18
19static void __init at91sam9x5_initialize(void)
20{
21 arm_pm_idle = at91sam9_idle;
22}
23
19AT91_SOC_START(at91sam9x5) 24AT91_SOC_START(at91sam9x5)
25 .init = at91sam9x5_initialize,
20AT91_SOC_END 26AT91_SOC_END