|
@@ -20,6 +20,7 @@
|
|
#include <linux/io.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irqchip/arm-gic.h>
|
|
#include <linux/irqchip/arm-gic.h>
|
|
#include <linux/err.h>
|
|
#include <linux/err.h>
|
|
|
|
+#include <linux/regulator/machine.h>
|
|
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
@@ -443,6 +444,22 @@ static int exynos_suspend_enter(suspend_state_t state)
|
|
|
|
|
|
static int exynos_suspend_prepare(void)
|
|
static int exynos_suspend_prepare(void)
|
|
{
|
|
{
|
|
|
|
+ int ret;
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * REVISIT: It would be better if struct platform_suspend_ops
|
|
|
|
+ * .prepare handler get the suspend_state_t as a parameter to
|
|
|
|
+ * avoid hard-coding the suspend to mem state. It's safe to do
|
|
|
|
+ * it now only because the suspend_valid_only_mem function is
|
|
|
|
+ * used as the .valid callback used to check if a given state
|
|
|
|
+ * is supported by the platform anyways.
|
|
|
|
+ */
|
|
|
|
+ ret = regulator_suspend_prepare(PM_SUSPEND_MEM);
|
|
|
|
+ if (ret) {
|
|
|
|
+ pr_err("Failed to prepare regulators for suspend (%d)\n", ret);
|
|
|
|
+ return ret;
|
|
|
|
+ }
|
|
|
|
+
|
|
s3c_pm_check_prepare();
|
|
s3c_pm_check_prepare();
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
@@ -450,7 +467,13 @@ static int exynos_suspend_prepare(void)
|
|
|
|
|
|
static void exynos_suspend_finish(void)
|
|
static void exynos_suspend_finish(void)
|
|
{
|
|
{
|
|
|
|
+ int ret;
|
|
|
|
+
|
|
s3c_pm_check_cleanup();
|
|
s3c_pm_check_cleanup();
|
|
|
|
+
|
|
|
|
+ ret = regulator_suspend_finish();
|
|
|
|
+ if (ret)
|
|
|
|
+ pr_warn("Failed to resume regulators from suspend (%d)\n", ret);
|
|
}
|
|
}
|
|
|
|
|
|
static const struct platform_suspend_ops exynos_suspend_ops = {
|
|
static const struct platform_suspend_ops exynos_suspend_ops = {
|