diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-01-15 22:58:07 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-01-26 13:43:34 +0100 |
| commit | 4fe604c8b3657c63354fef196509c1596058d9f2 (patch) | |
| tree | be2094147e3d855d6c097d783091451e06a56654 /arch/arm | |
| parent | ARM: at91: mark const init data with __initconst instead of __initdata (diff) | |
| download | linux-4fe604c8b3657c63354fef196509c1596058d9f2.tar.xz linux-4fe604c8b3657c63354fef196509c1596058d9f2.zip | |
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')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9n12.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9x5.c | 6 |
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 @@ /* -------------------------------------------------------------------- * AT91SAM9N12 processor initialization * -------------------------------------------------------------------- */ +static void __init at91sam9n12_initialize(void) +{ + arm_pm_idle = at91sam9_idle; +} AT91_SOC_START(at91sam9n12) + .init = at91sam9n12_initialize, AT91_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 @@ * AT91SAM9x5 processor initialization * -------------------------------------------------------------------- */ +static void __init at91sam9x5_initialize(void) +{ + arm_pm_idle = at91sam9_idle; +} + AT91_SOC_START(at91sam9x5) + .init = at91sam9x5_initialize, AT91_SOC_END |