diff options
| author | Kangheui Won <khwon@chromium.org> | 2021-05-26 13:40:21 +1000 |
|---|---|---|
| committer | Werner Zeh <werner.zeh@siemens.com> | 2021-06-07 05:16:06 +0000 |
| commit | 32f43e0e134eded6221dd59400b2a01860c72f76 (patch) | |
| tree | 24ba73c27b08a367fe243abdb63089254c363740 | |
| parent | 7ca3ecb73a78ccced90e9f9297030b6aed1c4252 (diff) | |
psp_verstage: initialize i2c in soc_init
GSC is connected with AP via i2c bus so we need to enable i2c in
psp_verstage.
Signed-off-by: Kangheui Won <khwon@chromium.org>
Change-Id: I5f7b73be67a692ea7de31ae53bd111d0e4b6998c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55136
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/google/guybrush/verstage.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/zork/verstage.c | 16 | ||||
| -rw-r--r-- | src/soc/amd/common/psp_verstage/fch.c | 6 |
3 files changed, 6 insertions, 20 deletions
diff --git a/src/mainboard/google/guybrush/verstage.c b/src/mainboard/google/guybrush/verstage.c index e7543c0779..42967290b4 100644 --- a/src/mainboard/google/guybrush/verstage.c +++ b/src/mainboard/google/guybrush/verstage.c @@ -19,7 +19,3 @@ void verstage_mainboard_early_init(void) { setup_gpio(); } - -void verstage_mainboard_init(void) -{ -} diff --git a/src/mainboard/google/zork/verstage.c b/src/mainboard/google/zork/verstage.c index dd59e734e3..3ef0423460 100644 --- a/src/mainboard/google/zork/verstage.c +++ b/src/mainboard/google/zork/verstage.c @@ -1,11 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include <amdblocks/gpio_banks.h> -#include <amdblocks/i2c.h> #include <baseboard/variants.h> -#include <console/console.h> #include <security/vboot/vboot_common.h> -#include <soc/southbridge.h> static void setup_gpio(void) { @@ -18,20 +15,7 @@ static void setup_gpio(void) printk(BIOS_DEBUG, "GPIOs setup\n"); } -static void setup_i2c(void) -{ - printk(BIOS_DEBUG, "Setting up i2c\n"); - i2c_soc_early_init(); - printk(BIOS_DEBUG, "i2c setup\n"); -} - void verstage_mainboard_early_init(void) { setup_gpio(); } - -void verstage_mainboard_init(void) -{ - enable_aoac_devices(); - setup_i2c(); -} diff --git a/src/soc/amd/common/psp_verstage/fch.c b/src/soc/amd/common/psp_verstage/fch.c index a032bde9b2..c74e88fd12 100644 --- a/src/soc/amd/common/psp_verstage/fch.c +++ b/src/soc/amd/common/psp_verstage/fch.c @@ -4,6 +4,7 @@ #include <amdblocks/acpimmio.h> #include <amdblocks/espi.h> +#include <amdblocks/i2c.h> #include <amdblocks/spi.h> #include <arch/exception.h> #include <arch/hlt.h> @@ -155,4 +156,9 @@ void verstage_soc_init(void) { if (CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI)) espi_setup(); + + enable_aoac_devices(); + printk(BIOS_DEBUG, "Setting up i2c\n"); + i2c_soc_early_init(); + printk(BIOS_DEBUG, "i2c setup\n"); } |