From b8dced3f637935877c8cab228637db801fa228b2 Mon Sep 17 00:00:00 2001 From: David Li Date: Fri, 14 Mar 2025 13:46:01 +0800 Subject: [PATCH] mb/google/nissa/var/guren: Add new DB config HDMI and HDMI+1A 1. Add DB_HDMI 6 on DB_USB fw_config 2. Add DB_HDMI_1A 7 on DB_USB fw_config BUG=b:405229505 BRANCH=firmware-nissa-15217.B TEST=emerge-nissa coreboot chromeos-bootimage Change-Id: I0757a87eeb97e6fcf7fbf79392786ed69e4563bb Signed-off-by: David Li Reviewed-on: https://review.coreboot.org/c/coreboot/+/86853 Reviewed-by: Dinesh Gehlot Reviewed-by: Jayvik Desai Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai --- src/mainboard/google/brya/variants/guren/fw_config.c | 4 +++- src/mainboard/google/brya/variants/guren/overridetree.cb | 4 ++++ src/mainboard/google/brya/variants/guren/variant.c | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mainboard/google/brya/variants/guren/fw_config.c b/src/mainboard/google/brya/variants/guren/fw_config.c index 52dff5c3ad..efebee2f20 100644 --- a/src/mainboard/google/brya/variants/guren/fw_config.c +++ b/src/mainboard/google/brya/variants/guren/fw_config.c @@ -29,7 +29,9 @@ static const struct pad_config lte_disable_pads[] = { void fw_config_gpio_padbased_override(struct pad_config *padbased_table) { - if (!fw_config_probe(FW_CONFIG(DB_USB, DB_HDMI_LTE))) { + if (!fw_config_probe(FW_CONFIG(DB_USB, DB_HDMI_LTE)) + && !fw_config_probe(FW_CONFIG(DB_USB, DB_HDMI)) + && !fw_config_probe(FW_CONFIG(DB_USB, DB_HDMI_1A))) { printk(BIOS_INFO, "Disable HDMI GPIO pins.\n"); gpio_padbased_override(padbased_table, hdmi_disable_pads, ARRAY_SIZE(hdmi_disable_pads)); diff --git a/src/mainboard/google/brya/variants/guren/overridetree.cb b/src/mainboard/google/brya/variants/guren/overridetree.cb index 95c4b58307..0a62ca59b0 100644 --- a/src/mainboard/google/brya/variants/guren/overridetree.cb +++ b/src/mainboard/google/brya/variants/guren/overridetree.cb @@ -10,6 +10,8 @@ fw_config option DB_1C_1A 3 option DB_1C_LTE 4 option DB_HDMI_LTE 5 + option DB_HDMI 6 + option DB_HDMI_1A 7 end field SD_CARD 9 option SD_ABSENT 0 @@ -575,6 +577,7 @@ chip soc/intel/alderlake device ref usb2_port4 on probe DB_USB DB_1A probe DB_USB DB_1C_1A + probe DB_USB DB_HDMI_1A end end chip drivers/usb/acpi @@ -617,6 +620,7 @@ chip soc/intel/alderlake device ref usb3_port2 on probe DB_USB DB_1A probe DB_USB DB_1C_1A + probe DB_USB DB_HDMI_1A end end chip drivers/usb/acpi diff --git a/src/mainboard/google/brya/variants/guren/variant.c b/src/mainboard/google/brya/variants/guren/variant.c index ff71b6415e..c2c49f824e 100644 --- a/src/mainboard/google/brya/variants/guren/variant.c +++ b/src/mainboard/google/brya/variants/guren/variant.c @@ -12,7 +12,9 @@ const char *get_wifi_sar_cbfs_filename(void) void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) { - if (fw_config_probe(FW_CONFIG(DB_USB, DB_HDMI_LTE))) { + if (fw_config_probe(FW_CONFIG(DB_USB, DB_HDMI_LTE)) + || fw_config_probe(FW_CONFIG(DB_USB, DB_HDMI)) + || fw_config_probe(FW_CONFIG(DB_USB, DB_HDMI_1A))) { printk(BIOS_INFO, "Enable DDI PORT 2 for HPD and DDC.\n"); config->ddi_ports_config[DDI_PORT_2] = DDI_ENABLE_HPD | DDI_ENABLE_DDC; }