aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/main.c
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.com>2012-09-22 09:48:20 +0200
committercodeworkx <codeworkx@cyanogenmod.com>2012-09-22 14:02:16 +0200
commit2489007e7d740ccbc3e0a202914e243ad5178787 (patch)
treeb8e6380ea7b1da63474ad68a5dba997e01146043 /kernel/power/main.c
parent5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff)
downloadkernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r--kernel/power/main.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 7f6987f..9c54ff7 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -190,6 +190,12 @@ static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
#endif
return (s - buf);
}
+#ifdef CONFIG_FAST_BOOT
+bool fake_shut_down = false;
+EXPORT_SYMBOL(fake_shut_down);
+
+extern void wakelock_force_suspend(void);
+#endif
static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
const char *buf, size_t n)
@@ -220,15 +226,29 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
if (*s && len == strlen(*s) && !strncmp(buf, *s, len))
break;
}
- if (state < PM_SUSPEND_MAX && *s)
+
+#ifdef CONFIG_FAST_BOOT
+ if (len == 4 && !strncmp(buf, "dmem", len)) {
+ pr_info("%s: fake shut down!!!\n", __func__);
+ fake_shut_down = true;
+ state = PM_SUSPEND_MEM;
+ }
+#endif
+
+ if (state < PM_SUSPEND_MAX && *s) {
#ifdef CONFIG_EARLYSUSPEND
if (state == PM_SUSPEND_ON || valid_state(state)) {
error = 0;
request_suspend_state(state);
}
+#ifdef CONFIG_FAST_BOOT
+ if (fake_shut_down)
+ wakelock_force_suspend();
+#endif
#else
error = enter_state(state);
#endif
+ }
#endif
Exit:
@@ -683,7 +703,7 @@ static ssize_t mali_lock_store(struct kobject *kobj,
mali_lock_cnt = mali_dvfs_bottom_lock_pop();
if (mali_lock_cnt == 0)
mali_lock_val = 0;
- } else if (val > 0 && val < 4) { /* lock with level */
+ } else if (val > 0 && val < 5) { /* lock with level */
mali_lock_cnt = mali_dvfs_bottom_lock_push(val);
if (mali_lock_val < val)
mali_lock_val = val;