diff options
author | Javier Martinez Canillas <javier.martinez@collabora.co.uk> | 2014-11-12 21:14:40 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-11-21 08:49:47 -0500 |
commit | c645a598f99768e6cc82129081458dfdd0c273b7 (patch) | |
tree | 0e0c27f0f94798c336e6f2b2d06d1d7b984f18d1 | |
parent | adc548d77c22daa371d5217b382a139b593dec47 (diff) |
ARM: EXYNOS: Call regulator core suspend prepare and finish functions
The regulator framework has a set of helpers functions to be used when
the system is entering and leaving from suspend but these are not called
on Exynos platforms. This means that the .set_suspend_* function handlers
defined by regulator drivers are not called when the system is suspended.
Suggested-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-exynos/suspend.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index cc8d2374f1b1..f8e7dcd17055 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
21 | #include <linux/irqchip/arm-gic.h> | 21 | #include <linux/irqchip/arm-gic.h> |
22 | #include <linux/err.h> | 22 | #include <linux/err.h> |
23 | #include <linux/regulator/machine.h> | ||
23 | 24 | ||
24 | #include <asm/cacheflush.h> | 25 | #include <asm/cacheflush.h> |
25 | #include <asm/hardware/cache-l2x0.h> | 26 | #include <asm/hardware/cache-l2x0.h> |
@@ -443,6 +444,22 @@ static int exynos_suspend_enter(suspend_state_t state) | |||
443 | 444 | ||
444 | static int exynos_suspend_prepare(void) | 445 | static int exynos_suspend_prepare(void) |
445 | { | 446 | { |
447 | int ret; | ||
448 | |||
449 | /* | ||
450 | * REVISIT: It would be better if struct platform_suspend_ops | ||
451 | * .prepare handler get the suspend_state_t as a parameter to | ||
452 | * avoid hard-coding the suspend to mem state. It's safe to do | ||
453 | * it now only because the suspend_valid_only_mem function is | ||
454 | * used as the .valid callback used to check if a given state | ||
455 | * is supported by the platform anyways. | ||
456 | */ | ||
457 | ret = regulator_suspend_prepare(PM_SUSPEND_MEM); | ||
458 | if (ret) { | ||
459 | pr_err("Failed to prepare regulators for suspend (%d)\n", ret); | ||
460 | return ret; | ||
461 | } | ||
462 | |||
446 | s3c_pm_check_prepare(); | 463 | s3c_pm_check_prepare(); |
447 | 464 | ||
448 | return 0; | 465 | return 0; |
@@ -450,7 +467,13 @@ static int exynos_suspend_prepare(void) | |||
450 | 467 | ||
451 | static void exynos_suspend_finish(void) | 468 | static void exynos_suspend_finish(void) |
452 | { | 469 | { |
470 | int ret; | ||
471 | |||
453 | s3c_pm_check_cleanup(); | 472 | s3c_pm_check_cleanup(); |
473 | |||
474 | ret = regulator_suspend_finish(); | ||
475 | if (ret) | ||
476 | pr_warn("Failed to resume regulators from suspend (%d)\n", ret); | ||
454 | } | 477 | } |
455 | 478 | ||
456 | static const struct platform_suspend_ops exynos_suspend_ops = { | 479 | static const struct platform_suspend_ops exynos_suspend_ops = { |