projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/clk-divider' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-at91
/
pm.c
diff --git
a/arch/arm/mach-at91/pm.c
b/arch/arm/mach-at91/pm.c
index 73f1f250403a68575b78e02a8e8d72078ca42375..530db304ec5eb9b2fdca8d3a446789bc89334884 100644
(file)
--- 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;