diff options
| author | Wonjoon Lee <woojoo.lee@samsung.com> | 2016-09-29 16:31:10 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2016-10-03 14:42:54 +0000 |
| commit | 18615ede715fb1da6b3e82dd0f2dbb129b039ded (patch) | |
| tree | b8b2b5241e66eab5e246192b86d63c8f5848eb94 | |
| parent | ebe11695eae3b5b44593f5da68e9cde89583ee66 (diff) | |
| download | chrome-ec-18615ede715fb1da6b3e82dd0f2dbb129b039ded.tar.gz | |
celes: change hibernation key to go G3
BUG=chrome-os-partner:57704
BRANCH=celes
TEST=remove Ac, press alt-volumeup-H, See device goes G3
Change-Id: Ibc0cba7bdb4d5562ea97dce8d9308a58c720ec49
Signed-off-by: Wonjoon Lee <woojoo.lee@samsung.com>
Reviewed-on: https://chromium-review.googlesource.com/391173
Reviewed-by: Shawn N <shawnn@chromium.org>
| -rw-r--r-- | common/keyboard_scan.c | 5 | ||||
| -rw-r--r-- | include/power.h | 2 | ||||
| -rw-r--r-- | power/braswell.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index 4208d11b03..d843e5215d 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -16,6 +16,7 @@ #include "keyboard_raw.h" #include "keyboard_scan.h" #include "lid_switch.h" +#include "power.h" #include "switch.h" #include "system.h" #include "task.h" @@ -346,8 +347,8 @@ static int check_runtime_keys(const uint8_t *state) return 1; } else if (state[KEYBOARD_COL_KEY_H] == KEYBOARD_MASK_KEY_H) { /* H = hibernate */ - CPRINTS("KB hibernate"); - system_hibernate(0, 0); + CPRINTS("KB G3"); + enter_pseudo_g3(); return 1; } diff --git a/include/power.h b/include/power.h index 6a108c8690..9303008bce 100644 --- a/include/power.h +++ b/include/power.h @@ -117,8 +117,6 @@ inline int power_get_pause_in_s5(void); */ inline void power_set_pause_in_s5(int pause); -#ifdef CONFIG_LOW_POWER_PSEUDO_G3 void enter_pseudo_g3(void); -#endif #endif /* __CROS_EC_POWER_H */ diff --git a/power/braswell.c b/power/braswell.c index 22659f5309..c7639c2369 100644 --- a/power/braswell.c +++ b/power/braswell.c @@ -339,7 +339,6 @@ enum power_state power_handle_state(enum power_state state) return state; } -#ifdef CONFIG_LOW_POWER_PSEUDO_G3 void enter_pseudo_g3(void) { CPRINTS("Enter Psuedo G3"); @@ -352,4 +351,3 @@ void enter_pseudo_g3(void) while (1) ; } -#endif |