Revert "soc/mediatek/mt8196: Call fsp_init via boot state"
This reverts commit 14a7a2315e.
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 <yidilin@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/90703
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Reviewed-by: Chen-Tsung Hsieh <chentsung@google.com>
This commit is contained in:
parent
e705c39009
commit
292d7b9d3d
1 changed files with 2 additions and 4 deletions
|
|
@ -1,7 +1,6 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#include <bootmem.h>
|
||||
#include <bootstate.h>
|
||||
#include <device/device.h>
|
||||
#include <device/pci.h>
|
||||
#include <soc/booker.h>
|
||||
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue