From bc18fb3e1a47dbed229d3737b2200246fd46e7ee Mon Sep 17 00:00:00 2001 From: Bo-Chen Chen Date: Tue, 6 Sep 2022 14:41:57 +0800 Subject: [PATCH] mb/google/geralt: Pass reset gpio parameter to BL31 Pass the reset gpio parameter to BL31 to support SoC reset. TEST=build pass. BUG=b:233720142 Signed-off-by: Bo-Chen Chen Change-Id: Ifdfbd6bd82f64b084f6349cb617443053c89a3f1 Reviewed-on: https://review.coreboot.org/c/coreboot/+/67357 Reviewed-by: Yidi Lin Reviewed-by: Yu-Ping Wu Tested-by: build bot (Jenkins) --- src/mainboard/google/geralt/mainboard.c | 6 ++++++ src/soc/mediatek/mt8188/Makefile.inc | 1 + 2 files changed, 7 insertions(+) diff --git a/src/mainboard/google/geralt/mainboard.c b/src/mainboard/google/geralt/mainboard.c index 75b8bb5e4b..ddcb1bb000 100644 --- a/src/mainboard/google/geralt/mainboard.c +++ b/src/mainboard/google/geralt/mainboard.c @@ -1,14 +1,20 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include +#include #include #include +#include "gpio.h" + static void mainboard_init(struct device *dev) { mtk_msdc_configure_emmc(true); mtk_msdc_configure_sdcard(); setup_usb_host(); + + if (CONFIG(ARM64_USE_ARM_TRUSTED_FIRMWARE)) + register_reset_to_bl31(GPIO_AP_EC_WARM_RST_REQ.id, true); } static void mainboard_enable(struct device *dev) diff --git a/src/soc/mediatek/mt8188/Makefile.inc b/src/soc/mediatek/mt8188/Makefile.inc index 70ec42ae7f..3f83cbc5b7 100644 --- a/src/soc/mediatek/mt8188/Makefile.inc +++ b/src/soc/mediatek/mt8188/Makefile.inc @@ -29,6 +29,7 @@ romstage-y += ../common/pmif_spmi.c pmif_spmi.c romstage-y += ../common/rtc.c ../common/rtc_osc_init.c ../common/rtc_mt6359p.c ramstage-y += ../common/auxadc.c +ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += ../common/bl31.c ramstage-y += ../common/devapc.c devapc.c ramstage-y += ../common/dfd.c ramstage-y += ../common/dpm.c