From e8791361b5825d2133c778c63a520d45540dcaf2 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 6 Oct 2018 17:53:14 +0200 Subject: reset: Convert individual boards to `board_reset()` Change-Id: I6182da172ae2f4107a9b5d8190e4b3b10ed2f0b9 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/29048 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/mainboard/google/nyan/pmic.c | 2 +- src/mainboard/google/nyan/reset.c | 3 +-- src/mainboard/google/nyan/romstage.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/mainboard/google/nyan') diff --git a/src/mainboard/google/nyan/pmic.c b/src/mainboard/google/nyan/pmic.c index f115586b0f..d2264591fd 100644 --- a/src/mainboard/google/nyan/pmic.c +++ b/src/mainboard/google/nyan/pmic.c @@ -61,7 +61,7 @@ static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay) printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n", __func__, reg, val); /* Reset the SoC on any PMIC write error */ - hard_reset(); + board_reset(); } else { if (do_delay) udelay(500); diff --git a/src/mainboard/google/nyan/reset.c b/src/mainboard/google/nyan/reset.c index ee36292f70..468b0c2599 100644 --- a/src/mainboard/google/nyan/reset.c +++ b/src/mainboard/google/nyan/reset.c @@ -13,11 +13,10 @@ * GNU General Public License for more details. */ -#include #include #include -void do_hard_reset(void) +void do_board_reset(void) { gpio_output(GPIO(I5), 0); } diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c index 4ec0164b78..b96917e482 100644 --- a/src/mainboard/google/nyan/romstage.c +++ b/src/mainboard/google/nyan/romstage.c @@ -76,7 +76,7 @@ static void __attribute__((noinline)) romstage(void) */ if (power_reset_status() == POWER_RESET_WATCHDOG) { printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n"); - hard_reset(); + board_reset(); } /* FIXME: this may require coordination with moving timestamps */ -- cgit v1.2.3