summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo-Chen Chen <rex-bc.chen@mediatek.com>2022-09-06 14:41:57 +0800
committerFelix Held <felix-coreboot@felixheld.de>2022-09-07 09:20:45 +0000
commitbc18fb3e1a47dbed229d3737b2200246fd46e7ee (patch)
tree62fc7552077b71ea0ec32e8a47ac2b39719186b7
parenta01f8bc450d782c9b0859c8caaaa3df87fe5a854 (diff)
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 <rex-bc.chen@mediatek.com> Change-Id: Ifdfbd6bd82f64b084f6349cb617443053c89a3f1 Reviewed-on: https://review.coreboot.org/c/coreboot/+/67357 Reviewed-by: Yidi Lin <yidilin@google.com> Reviewed-by: Yu-Ping Wu <yupingso@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/geralt/mainboard.c6
-rw-r--r--src/soc/mediatek/mt8188/Makefile.inc1
2 files changed, 7 insertions, 0 deletions
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 <device/device.h>
+#include <soc/bl31.h>
#include <soc/msdc.h>
#include <soc/usb.h>
+#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