diff options
| author | Grover Yen <Grover_Yen@wistron.com> | 2015-08-25 19:20:37 +0800 |
|---|---|---|
| committer | ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> | 2015-08-26 01:57:03 +0000 |
| commit | 02ad3a5ced883f238f07aff3b831f53c11d8d087 (patch) | |
| tree | e9fa4eec5fadc0c89279edc9b29dd0265aeebc70 | |
| parent | 3d686709f0a13f406941e2b8c68a11683fe971b1 (diff) | |
| download | chrome-ec-02ad3a5ced883f238f07aff3b831f53c11d8d087.tar.gz | |
buddy: Fix power button malfunction in S0.
Take KEYPROTO task back for power button scan code.
BUG=none
BRANCH=none
TEST=Confirm power button workable in S0.
Change-Id: Ib742f1f13f921f6637cd10456f565d77a71766f5
Signed-off-by: Grover Yen <Grover_Yen@wistron.com>
Reviewed-on: https://chromium-review.googlesource.com/295500
Reviewed-by: Mohammed Habibulla <moch@google.com>
Commit-Queue: Angus Ku <angus_ku@wistron.com>
Tested-by: Angus Ku <angus_ku@wistron.com>
| -rw-r--r-- | board/buddy/ec.tasklist | 1 | ||||
| -rw-r--r-- | include/config.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/board/buddy/ec.tasklist b/board/buddy/ec.tasklist index ac1281571f..ea633dbbca 100644 --- a/board/buddy/ec.tasklist +++ b/board/buddy/ec.tasklist @@ -20,6 +20,7 @@ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ + TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) diff --git a/include/config.h b/include/config.h index 1f31b1f7f1..151a9e3d55 100644 --- a/include/config.h +++ b/include/config.h @@ -1178,7 +1178,9 @@ #endif #ifndef HAS_TASK_KEYSCAN +#ifndef HAS_TASK_KEYPROTO #undef CONFIG_KEYBOARD_PROTOCOL_8042 +#endif #undef CONFIG_KEYBOARD_PROTOCOL_MKBP #endif |