diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-19 11:50:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-19 11:51:24 -0700 |
| commit | 61b464aef0e306f141dbc0bb3f9c58049a987a7e (patch) | |
| tree | e4a43e5b52f72df8e8417aa918f2fe3ea57d0071 /arch/arm/mach-at91/pm.c | |
| parent | a71efd61db6368629b1b3e403076c957207f79bd (diff) | |
| parent | f5fa4098c3fcc0e504fbc0682dccd331dbbcf197 (diff) | |
Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup
From Nicolas Ferre:
Little modification in SoC presentation in kernel log.
Removing of a long-standing warning in sam9263 PM code.
* tag 'at91-soc' of git://github.com/at91linux/linux-at91:
ARM: at91: suspend both memory controllers on at91sam9263
ARM: at91: change "Unknown" qualifier SoC subtype handling
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-at91/pm.c')
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 73f1f250403a..530db304ec5e 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -270,6 +270,8 @@ static int at91_pm_enter(suspend_state_t state) at91rm9200_standby(); else if (cpu_is_at91sam9g45()) at91sam9g45_standby(); + else if (cpu_is_at91sam9263()) + at91sam9263_standby(); else at91sam9_standby(); break; |