From c7d18636c098a08070c7cab7e8389b6c452351e7 Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Thu, 8 Apr 2021 11:43:59 +0800 Subject: [PATCH] mb/google/mancomb: Enable AP <-> H1 communication BUG=b:182211161 TEST=builds Signed-off-by: Eric Lai Change-Id: I29be8572bc7bb366347eabe553be49775dec46a8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/52175 Tested-by: build bot (Jenkins) Reviewed-by: Mathew King --- src/mainboard/google/mancomb/Kconfig | 10 ++++++++++ .../google/mancomb/variants/baseboard/devicetree.cb | 8 ++++++++ src/mainboard/google/mancomb/variants/baseboard/gpio.c | 6 ++++++ 3 files changed, 24 insertions(+) diff --git a/src/mainboard/google/mancomb/Kconfig b/src/mainboard/google/mancomb/Kconfig index 85a50b399d..5851e5ccef 100644 --- a/src/mainboard/google/mancomb/Kconfig +++ b/src/mainboard/google/mancomb/Kconfig @@ -20,6 +20,8 @@ config BOARD_SPECIFIC_OPTIONS select ELOG_GSMI select HAVE_ACPI_RESUME select MAINBOARD_HAS_CHROMEOS + select MAINBOARD_HAS_I2C_TPM_CR50 + select MAINBOARD_HAS_TPM2 select SOC_AMD_CEZANNE select SOC_AMD_COMMON_BLOCK_USE_ESPI @@ -49,6 +51,14 @@ config AMD_FWM_POSITION_INDEX help TODO: might need to be adapted for better placement of files in cbfs +config DRIVER_TPM_I2C_BUS + hex + default 0x03 + +config DRIVER_TPM_I2C_ADDR + hex + default 0x50 + config VARIANT_DIR string default "mancomb" if BOARD_GOOGLE_MANCOMB diff --git a/src/mainboard/google/mancomb/variants/baseboard/devicetree.cb b/src/mainboard/google/mancomb/variants/baseboard/devicetree.cb index 533e2b4faa..0a604a37f5 100644 --- a/src/mainboard/google/mancomb/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/mancomb/variants/baseboard/devicetree.cb @@ -121,5 +121,13 @@ chip soc/amd/cezanne device pnp 0c09.0 on end end end + device ref i2c_3 on + chip drivers/i2c/tpm + register "hid" = ""GOOG0005"" + register "desc" = ""Cr50 TPM"" + register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_3)" + device i2c 50 on end + end + end end # domain end # chip soc/amd/cezanne diff --git a/src/mainboard/google/mancomb/variants/baseboard/gpio.c b/src/mainboard/google/mancomb/variants/baseboard/gpio.c index bcca693c51..cd86f9c69c 100644 --- a/src/mainboard/google/mancomb/variants/baseboard/gpio.c +++ b/src/mainboard/google/mancomb/variants/baseboard/gpio.c @@ -163,6 +163,12 @@ static const struct soc_amd_gpio base_gpio_table[] = { /* Early GPIO configuration */ static const struct soc_amd_gpio early_gpio_table[] = { + /* GSC_SOC_INT_L */ + PAD_INT(GPIO_3, PULL_NONE, EDGE_LOW, STATUS_DELIVERY), + /* I2C3_SCL */ + PAD_NF(GPIO_19, I2C3_SCL, PULL_NONE), + /* I2C3_SDA */ + PAD_NF(GPIO_20, I2C3_SDA, PULL_NONE), /* ESPI1_DATA0 */ PAD_NF(GPIO_104, SPI2_DO_ESPI2_D0, PULL_NONE), /* ESPI1_DATA1 */