From 292d7b9d3d4ccf852a9c20b8fafb5663bff7ff56 Mon Sep 17 00:00:00 2001 From: Yidi Lin Date: Thu, 8 Jan 2026 15:08:32 +0000 Subject: [PATCH] Revert "soc/mediatek/mt8196: Call fsp_init via boot state" This reverts commit 14a7a2315e722ef83b567d1918d7990eb83a451c. Reason for revert: The change causes DUT failed to resume from S3. BUG=b:474254985 TEST=Wake up DUT by power key. Change-Id: I2f2291a12d9b440d000a28e38bb590bc77a02c8a Signed-off-by: Yidi Lin Reviewed-on: https://review.coreboot.org/c/coreboot/+/90703 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu Reviewed-by: Chen-Tsung Hsieh --- src/soc/mediatek/mt8196/soc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/soc/mediatek/mt8196/soc.c b/src/soc/mediatek/mt8196/soc.c index e988a76926..24077a0fbc 100644 --- a/src/soc/mediatek/mt8196/soc.c +++ b/src/soc/mediatek/mt8196/soc.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include -#include #include #include #include @@ -57,7 +56,7 @@ static void mte_setup(void) booker_mte_init(mte_start); } -static void fsp_init(void *arg) +static void fsp_init(void) { uint32_t storage_type = mainboard_get_storage_type(); @@ -68,8 +67,6 @@ static void fsp_init(void *arg) mtk_fsp_load_and_run(); } -BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, fsp_init, NULL); - static void soc_init(struct device *dev) { mtk_mmu_disable_l2c_sram(); @@ -79,6 +76,7 @@ static void soc_init(struct device *dev) if (spm_init()) printk(BIOS_ERR, "spm init failed, Suspend may not work\n"); + fsp_init(); sspm_init(); gpueb_init(); mcupm_init();