diff --git a/src/mainboard/google/brya/variants/guren/overridetree.cb b/src/mainboard/google/brya/variants/guren/overridetree.cb index 77ec260074..8b1adb14f9 100644 --- a/src/mainboard/google/brya/variants/guren/overridetree.cb +++ b/src/mainboard/google/brya/variants/guren/overridetree.cb @@ -21,6 +21,10 @@ fw_config option WIFI_SAR_ID_INTEL_CONVERTIBLE 0 option WIFI_SAR_ID_INTEL_CLAMSHELL 1 end + field WFC 17 18 + option WFC_ABSENT 0 + option WFC_PRESENT 1 + end field TOUCHSCREEN_SOURCE 32 34 option TOUCHSCREEN_UNPROVISIONED 0 option TOUCHSCREEN_ELAN0001 1 @@ -87,6 +91,7 @@ chip soc/intel/alderlake register "typec_aux_bias_pads[0]" = "{.pad_auxp_dc = GPP_E22, .pad_auxn_dc = GPP_E23}" register "typec_aux_bias_pads[1]" = "{.pad_auxp_dc = GPP_A21, .pad_auxn_dc = GPP_A22}" + register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # WFC register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth port for CNVi WLAN # Configure external V1P05/Vnn/VnnSx Rails @@ -595,9 +600,11 @@ chip soc/intel/alderlake device ref usb2_port6 on end end chip drivers/usb/acpi - register "desc" = ""USB2 Camera"" + register "desc" = ""USB2 WFC"" register "type" = "UPC_TYPE_INTERNAL" - device ref usb2_port7 on end + device ref usb2_port7 on + probe WFC WFC_PRESENT + end end chip drivers/usb/acpi register "desc" = ""USB2 Bluetooth"" diff --git a/src/mainboard/google/brya/variants/guren/variant.c b/src/mainboard/google/brya/variants/guren/variant.c index c2c49f824e..4949083fd7 100644 --- a/src/mainboard/google/brya/variants/guren/variant.c +++ b/src/mainboard/google/brya/variants/guren/variant.c @@ -18,4 +18,9 @@ void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) 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; } + + if (!fw_config_probe(FW_CONFIG(WFC, WFC_PRESENT))) { + printk(BIOS_INFO, "Disable usb2_port7 of WFC.\n"); + config->usb2_ports[6] = (struct usb2_port_config) USB2_PORT_EMPTY; + } }