diff options
| author | Tristan Shieh <tristan.shieh@mediatek.com> | 2019-01-28 15:31:50 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-01-29 12:30:34 +0000 |
| commit | e6a03e0b1b75b8470c992346376e098187b14f12 (patch) | |
| tree | 0afe223ec0b6d1cccdc7cffe6241688f1480720a /src/soc/mediatek/common | |
| parent | b251c024609ebeb2f38a86d679065155333a61d1 (diff) | |
| download | coreboot-e6a03e0b1b75b8470c992346376e098187b14f12.tar.xz | |
mediatek: Separate WDT reset function from WDT driver
Separate WDT reset function from WDT driver, then we can use the common
WDT driver and have a board-specific reset function on different boards.
In Kukui, we plan to use GPIO HW reset, instead of WDT reset. Add config
"MISSING_BOARD_RESET" in Kukui to pass the build for now.
BUG=b:80501386
BRANCH=none
TEST=emerge-elm coreboot; emerge-kukui coreboot;
Change-Id: Ica07fe3a027cd7e9eb6d10202c3ef3ed7bea00c2
Signed-off-by: Tristan Shieh <tristan.shieh@mediatek.com>
Reviewed-on: https://review.coreboot.org/c/31121
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/mediatek/common')
| -rw-r--r-- | src/soc/mediatek/common/include/soc/wdt.h | 3 | ||||
| -rw-r--r-- | src/soc/mediatek/common/reset.c | 23 | ||||
| -rw-r--r-- | src/soc/mediatek/common/wdt.c | 9 |
3 files changed, 26 insertions, 9 deletions
diff --git a/src/soc/mediatek/common/include/soc/wdt.h b/src/soc/mediatek/common/include/soc/wdt.h index a15434c70d..b24be28e3f 100644 --- a/src/soc/mediatek/common/include/soc/wdt.h +++ b/src/soc/mediatek/common/include/soc/wdt.h @@ -17,6 +17,7 @@ #define SOC_MEDIATEK_COMMON_WDT_H #include <stdint.h> +#include <soc/addressmap.h> struct mtk_wdt_regs { u32 wdt_mode; @@ -48,6 +49,8 @@ enum { MTK_WDT_STA_HW_RST = 1 << 31 }; +static struct mtk_wdt_regs *const mtk_wdt = (void *)RGU_BASE; + int mtk_wdt_init(void); #endif /* SOC_MEDIATEK_COMMON_WDT_H */ diff --git a/src/soc/mediatek/common/reset.c b/src/soc/mediatek/common/reset.c new file mode 100644 index 0000000000..855e34fb18 --- /dev/null +++ b/src/soc/mediatek/common/reset.c @@ -0,0 +1,23 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 MediaTek Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <arch/io.h> +#include <reset.h> +#include <soc/wdt.h> + +void do_board_reset(void) +{ + write32(&mtk_wdt->wdt_swrst, MTK_WDT_SWRST_KEY); +} diff --git a/src/soc/mediatek/common/wdt.c b/src/soc/mediatek/common/wdt.c index 9964c5ab72..b433c98fbe 100644 --- a/src/soc/mediatek/common/wdt.c +++ b/src/soc/mediatek/common/wdt.c @@ -15,13 +15,9 @@ #include <arch/io.h> #include <console/console.h> -#include <reset.h> -#include <soc/addressmap.h> #include <soc/wdt.h> #include <vendorcode/google/chromeos/chromeos.h> -static struct mtk_wdt_regs *const mtk_wdt = (void *)RGU_BASE; - int mtk_wdt_init(void) { uint32_t wdt_sta; @@ -56,8 +52,3 @@ int mtk_wdt_init(void) return wdt_sta; } - -void do_board_reset(void) -{ - write32(&mtk_wdt->wdt_swrst, MTK_WDT_SWRST_KEY); -} |