summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2020-06-12 12:53:00 -0700
committerCommit Bot <commit-bot@chromium.org>2020-06-13 02:14:50 +0000
commitc352ad138dbcf3ff5041626e438841dab6992e68 (patch)
tree4350698bf4f51f74e676be036bff9081f34a3e30
parent4508ef09d187de4f2cb0c7a15a9708b09d892af1 (diff)
downloadchrome-ec-c352ad138dbcf3ff5041626e438841dab6992e68.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>
-rw-r--r--common/system.c4
-rw-r--r--include/ec_commands.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/common/system.c b/common/system.c
index 49153f6194..be900f58fc 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 390df6a687..877ce3476b 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 */