diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2020-06-12 12:53:00 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-30 16:13:33 +0000 |
| commit | 2a4994251811c87529f9d6a8eabaafe032613d3a (patch) | |
| tree | 1152bcb651a4568808b554bab5547a7bb6fae38d | |
| parent | 5b6f670855beb96cbac63e2a723a8fae0d633468 (diff) | |
| download | chrome-ec-2a4994251811c87529f9d6a8eabaafe032613d3a.tar.gz | |
PB: Clear AP_IDLE for EC_REBOOT_HIBERNATE_CLEAR_AP_OFF
This patch fixes the EC_REBOOT_HIBERNATE_CLEAR_AP_OFF command to
match the change made by CL:2213730.
There is no functionality change.
BUG=b:37536389
BRANCH=none
TEST=Verify ectool hibernate-clear-ap-off works.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: I70ec3a38b0ceaca8a79c6e2c6df127fb145496e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2242662
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
(cherry picked from commit c352ad138dbcf3ff5041626e438841dab6992e68)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2327967
Tested-by: Jeff Chase <jnchase@google.com>
Auto-Submit: Jeff Chase <jnchase@google.com>
Reviewed-by: Jeff Chase <jnchase@google.com>
Commit-Queue: Jeff Chase <jnchase@google.com>
| -rw-r--r-- | common/system.c | 4 | ||||
| -rw-r--r-- | include/ec_commands.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/system.c b/common/system.c index 8e3f591db7..abf66315db 100644 --- a/common/system.c +++ b/common/system.c @@ -898,9 +898,9 @@ static int handle_pending_reboot(enum ec_reboot_cmd cmd) return EC_ERROR_INVAL; if (IS_ENABLED(CONFIG_POWER_BUTTON_INIT_IDLE)) { - CPRINTS("Clearing AP_OFF"); + CPRINTS("Clearing AP_IDLE"); chip_save_reset_flags(chip_read_reset_flags() & - ~EC_RESET_FLAG_AP_OFF); + ~EC_RESET_FLAG_AP_IDLE); } /* Intentional fall-through */ case EC_REBOOT_HIBERNATE: diff --git a/include/ec_commands.h b/include/ec_commands.h index 82a34b1666..523c82f470 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -5131,7 +5131,7 @@ enum ec_reboot_cmd { EC_REBOOT_COLD = 4, /* Cold-reboot */ EC_REBOOT_DISABLE_JUMP = 5, /* Disable jump until next reboot */ EC_REBOOT_HIBERNATE = 6, /* Hibernate EC */ - EC_REBOOT_HIBERNATE_CLEAR_AP_OFF = 7, /* and clears AP_OFF flag */ + EC_REBOOT_HIBERNATE_CLEAR_AP_OFF = 7, /* and clears AP_IDLE flag */ }; /* Flags for ec_params_reboot_ec.reboot_flags */ |