diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/host/chipset.c | 2 | ||||
| -rw-r--r-- | board/kevin/board.c | 2 | ||||
| -rw-r--r-- | board/oak/board.c | 2 | ||||
| -rw-r--r-- | board/rainier/board.c | 2 | ||||
| -rw-r--r-- | board/samus/power_sequence.c | 45 | ||||
| -rw-r--r-- | board/scarlet/board.c | 2 |
6 files changed, 18 insertions, 37 deletions
diff --git a/board/host/chipset.c b/board/host/chipset.c index 678d5a97e0..62e7151e06 100644 --- a/board/host/chipset.c +++ b/board/host/chipset.c @@ -16,7 +16,7 @@ static int chipset_state = CHIPSET_STATE_SOFT_OFF; static int power_on_req; static int power_off_req; -test_mockable void chipset_reset(int cold_reset) +test_mockable void chipset_reset(void) { fprintf(stderr, "Chipset reset!\n"); } diff --git a/board/kevin/board.c b/board/kevin/board.c index 1ec3e6bf1e..71bc55243b 100644 --- a/board/kevin/board.c +++ b/board/kevin/board.c @@ -68,7 +68,7 @@ static void overtemp_interrupt(enum gpio_signal signal) static void warm_reset_request_interrupt(enum gpio_signal signal) { CPRINTS("AP wants warm reset"); - chipset_reset(0); + chipset_reset(); } #include "gpio_list.h" diff --git a/board/oak/board.c b/board/oak/board.c index d949194907..a9f05c4e86 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -426,7 +426,7 @@ static void check_ap_reset_second(void) return; if (warm_reset) - chipset_reset(0); /* Warm reset AP */ + chipset_reset(); /* Warm reset AP */ last = warm_reset; } diff --git a/board/rainier/board.c b/board/rainier/board.c index c173b2f427..e0831301ce 100644 --- a/board/rainier/board.c +++ b/board/rainier/board.c @@ -61,7 +61,7 @@ static void overtemp_interrupt(enum gpio_signal signal) static void warm_reset_request_interrupt(enum gpio_signal signal) { CPRINTS("AP wants warm reset"); - chipset_reset(0); + chipset_reset(); } #include "gpio_list.h" diff --git a/board/samus/power_sequence.c b/board/samus/power_sequence.c index cac9647a44..804d3ef208 100644 --- a/board/samus/power_sequence.c +++ b/board/samus/power_sequence.c @@ -111,41 +111,22 @@ static void chipset_reset_rtc(void) udelay(10 * MSEC); } -void chipset_reset(int cold_reset) +void chipset_reset(void) { - CPRINTS("%s(%d)", __func__, cold_reset); - if (cold_reset) { - /* - * Drop and restore PWROK. This causes the PCH to reboot, - * regardless of its after-G3 setting. This type of reboot - * causes the PCH to assert PLTRST#, SLP_S3#, and SLP_S5#, so - * we actually drop power to the rest of the system (hence, a - * "cold" reboot). - */ - - /* Ignore if PWROK is already low */ - if (gpio_get_level(GPIO_PCH_PWROK) == 0) - return; - - /* PWROK must deassert for at least 3 RTC clocks = 91 us */ - gpio_set_level(GPIO_PCH_PWROK, 0); - udelay(100); - gpio_set_level(GPIO_PCH_PWROK, 1); + CPRINTS("%s", __func__); - } else { - /* - * Send a RCIN# pulse to the PCH. This just causes it to - * assert INIT# to the CPU without dropping power or asserting - * PLTRST# to reset the rest of the system. - */ + /* + * Send a RCIN# pulse to the PCH. This just causes it to + * assert INIT# to the CPU without dropping power or asserting + * PLTRST# to reset the rest of the system. + */ - /* - * Pulse must be at least 16 PCI clocks long = 500 ns. - */ - gpio_set_level(GPIO_PCH_RCIN_L, 0); - udelay(10); - gpio_set_level(GPIO_PCH_RCIN_L, 1); - } + /* + * Pulse must be at least 16 PCI clocks long = 500 ns. + */ + gpio_set_level(GPIO_PCH_RCIN_L, 0); + udelay(10); + gpio_set_level(GPIO_PCH_RCIN_L, 1); } void chipset_throttle_cpu(int throttle) diff --git a/board/scarlet/board.c b/board/scarlet/board.c index 21b2424ea1..fb40b6d0cf 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -63,7 +63,7 @@ static void overtemp_interrupt(enum gpio_signal signal) static void warm_reset_request_interrupt(enum gpio_signal signal) { CPRINTS("AP wants warm reset"); - chipset_reset(0); + chipset_reset(); } #include "gpio_list.h" |