diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/ap_hang_detect.c | 2 | ||||
| -rw-r--r-- | common/button.c | 4 | ||||
| -rw-r--r-- | common/chipset.c | 13 | ||||
| -rw-r--r-- | common/keyboard_8042.c | 2 | ||||
| -rw-r--r-- | common/keyboard_scan.c | 2 |
5 files changed, 8 insertions, 15 deletions
diff --git a/common/ap_hang_detect.c b/common/ap_hang_detect.c index b5098e15b2..45e735e526 100644 --- a/common/ap_hang_detect.c +++ b/common/ap_hang_detect.c @@ -41,7 +41,7 @@ static void hang_detect_deferred(void) if (timeout_will_reboot) { CPRINTS("hang detect triggering warm reboot"); host_set_single_event(EC_HOST_EVENT_HANG_REBOOT); - chipset_reset(0); + chipset_reset(); active = 0; return; } diff --git a/common/button.c b/common/button.c index 5a48c8842e..6190f414bb 100644 --- a/common/button.c +++ b/common/button.c @@ -416,7 +416,7 @@ static void debug_mode_handle(void) host_send_sysrq('x'); CPRINTS("DEBUG MODE: sysrq-x sent"); } else { - chipset_reset(0); + chipset_reset(); CPRINTS("DEBUG MODE: Warm reset triggered"); } recovery_button_pressed = 0; @@ -531,7 +531,7 @@ static void debug_mode_transition(enum debug_state next_state) break; case STATE_WARM_RESET_EXEC: /* Warm reset the host and transition to STATE_NONE. */ - chipset_reset(0); + chipset_reset(); CPRINTS("DEBUG MODE: Warm reset triggered"); curr_debug_state = STATE_DEBUG_NONE; break; diff --git a/common/chipset.c b/common/chipset.c index 1d236fdc14..7a2101624a 100644 --- a/common/chipset.c +++ b/common/chipset.c @@ -20,20 +20,13 @@ #ifdef CONFIG_CMD_POWER_AP static int command_apreset(int argc, char **argv) { - int is_cold = 1; - - if (argc > 1 && !strcasecmp(argv[1], "cold")) - is_cold = 1; - else if (argc > 1 && !strcasecmp(argv[1], "warm")) - is_cold = 0; - /* Force the chipset to reset */ - ccprintf("Issuing AP %s reset...\n", is_cold ? "cold" : "warm"); - chipset_reset(is_cold); + ccprintf("Issuing AP reset...\n"); + chipset_reset(); return EC_SUCCESS; } DECLARE_CONSOLE_COMMAND(apreset, command_apreset, - "[warm | cold]", + NULL, "Issue AP reset"); static int command_apshutdown(int argc, char **argv) diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index 3e1836a518..b18be07649 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -729,7 +729,7 @@ static int handle_keyboard_command(uint8_t command, uint8_t *output) break; case I8042_SYSTEM_RESET: - chipset_reset(0); + chipset_reset(); break; default: diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index 34474917b3..e63c164100 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -358,7 +358,7 @@ static int check_runtime_keys(const uint8_t *state) /* R = reboot */ CPRINTS("KB warm reboot"); keyboard_clear_buffer(); - chipset_reset(0); + chipset_reset(); return 1; } else if (state[KEYBOARD_COL_KEY_H] == KEYBOARD_MASK_KEY_H) { /* H = hibernate */ |