From 1897a3abd9f213c32999ee97c0e7e19a3c9c5f12 Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Wed, 15 Sep 2021 12:16:06 +0800 Subject: [PATCH] mb/google/brya/var/felwinter: Configurate AUX pin for USB3 MB USB3 MB doesn't have re-timer. Thus we have to configurate the AUX pin. For now, we use USB3 DB to determine the USB3 MB. BUG=b:197907500 TEST=NA Signed-off-by: Eric Lai Change-Id: Ide45c77e0a6f736a02d5dc9ad05aa1ef9e754fa5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57656 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- .../google/brya/variants/felwinter/Makefile.inc | 1 + .../google/brya/variants/felwinter/overridetree.cb | 14 +++++++++++--- .../google/brya/variants/felwinter/variant.c | 13 +++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/mainboard/google/brya/variants/felwinter/variant.c diff --git a/src/mainboard/google/brya/variants/felwinter/Makefile.inc b/src/mainboard/google/brya/variants/felwinter/Makefile.inc index 8fe978f6ef..0256c73bb4 100644 --- a/src/mainboard/google/brya/variants/felwinter/Makefile.inc +++ b/src/mainboard/google/brya/variants/felwinter/Makefile.inc @@ -2,3 +2,4 @@ bootblock-y += gpio.c ramstage-y += gpio.c +ramstage-$(CONFIG_FW_CONFIG) += variant.c diff --git a/src/mainboard/google/brya/variants/felwinter/overridetree.cb b/src/mainboard/google/brya/variants/felwinter/overridetree.cb index 594cb6c614..0fa2e616d9 100644 --- a/src/mainboard/google/brya/variants/felwinter/overridetree.cb +++ b/src/mainboard/google/brya/variants/felwinter/overridetree.cb @@ -1,3 +1,11 @@ +fw_config + field DB_USB 0 2 + option USB_ABSENT 0 + option USB3_PS8815 1 + option USB4_KB8001 2 + end +end + chip soc/intel/alderlake register "SaGv" = "SaGv_Disabled" @@ -7,8 +15,6 @@ chip soc/intel/alderlake .configure_ext_fivr = 1, }" - register "typec_aux_bias_pads[2]" = "{.pad_auxp_dc = GPP_A19, .pad_auxn_dc = GPP_A20}" - register "usb2_ports[3]" = "USB2_PORT_EMPTY" register "usb3_ports[3]" = "USB3_PORT_EMPTY" @@ -48,7 +54,9 @@ chip soc/intel/alderlake chip drivers/intel/usb4/retimer register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4)" use tcss_usb3_port3 as dfp[0].typec_port - device generic 0 on end + device generic 0 on + probe DB_USB USB4_KB8001 + end end end device ref pcie_rp8 on diff --git a/src/mainboard/google/brya/variants/felwinter/variant.c b/src/mainboard/google/brya/variants/felwinter/variant.c new file mode 100644 index 0000000000..9234019952 --- /dev/null +++ b/src/mainboard/google/brya/variants/felwinter/variant.c @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include + +void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) +{ + if (fw_config_probe(FW_CONFIG(DB_USB, USB3_PS8815))) { + config->typec_aux_bias_pads[2].pad_auxp_dc = GPP_A19; + config->typec_aux_bias_pads[2].pad_auxn_dc = GPP_A20; + } +}