diff --git a/src/mainboard/google/brya/variants/rull/overridetree.cb b/src/mainboard/google/brya/variants/rull/overridetree.cb index 92bc5d42b0..633d5bc711 100644 --- a/src/mainboard/google/brya/variants/rull/overridetree.cb +++ b/src/mainboard/google/brya/variants/rull/overridetree.cb @@ -6,6 +6,7 @@ fw_config field WIFI 8 9 option WIFI_CNVI_WIFI6E 0 option WIFI_PCIE_WIFI7 1 + option WIFI_UNKNOWN 2 end end @@ -393,8 +394,8 @@ chip soc/intel/alderlake register "add_acpi_dma_property" = "true" device generic 0 on end end - probe WIFI WIFI_CNVI_WIFI6E - probe unprovisioned + probe WIFI WIFI_CNVI_WIFI6E + probe WIFI WIFI_UNKNOWN end device ref pcie_rp4 on # PCIe 4 WLAN @@ -416,7 +417,7 @@ chip soc/intel/alderlake device generic 0 on end end probe WIFI WIFI_PCIE_WIFI7 - probe unprovisioned + probe WIFI WIFI_UNKNOWN end device ref pch_espi on chip ec/google/chromeec @@ -518,7 +519,10 @@ chip soc/intel/alderlake register "desc" = ""PCIe Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D4)" - device ref usb2_port8 on end + device ref usb2_port8 on + probe WIFI WIFI_PCIE_WIFI7 + probe WIFI WIFI_UNKNOWN + end end chip drivers/usb/acpi register "desc" = ""CNVi Bluetooth"" @@ -526,6 +530,7 @@ chip soc/intel/alderlake register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D4)" device ref usb2_port10 on probe WIFI WIFI_CNVI_WIFI6E + probe WIFI WIFI_UNKNOWN end end chip drivers/usb/acpi @@ -569,15 +574,14 @@ chip soc/intel/alderlake register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D11)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)" register "srcclk_pin" = "1" - device generic 0 on - probe STORAGE STORAGE_NVME - probe unprovisioned - end + device generic 0 on end end + probe STORAGE STORAGE_NVME + probe STORAGE STORAGE_UNKNOWN end device ref emmc on probe STORAGE STORAGE_EMMC - probe unprovisioned + probe STORAGE STORAGE_UNKNOWN end device ref hda on chip drivers/sof diff --git a/src/mainboard/google/brya/variants/rull/variant.c b/src/mainboard/google/brya/variants/rull/variant.c index e1a95e6aa9..4f8fd4777f 100644 --- a/src/mainboard/google/brya/variants/rull/variant.c +++ b/src/mainboard/google/brya/variants/rull/variant.c @@ -18,7 +18,7 @@ const char *get_wifi_sar_cbfs_filename(void) void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) { - if (!fw_config_is_provisioned() || fw_config_probe(FW_CONFIG(WIFI, WIFI_CNVI_WIFI6E))) { + if (fw_config_probe(FW_CONFIG(WIFI, WIFI_CNVI_WIFI6E)) || fw_config_probe(FW_CONFIG(WIFI, WIFI_UNKNOWN))) { printk(BIOS_INFO, "CNVi bluetooth enabled by fw_config\n"); config->cnvi_bt_core = true; config->cnvi_bt_audio_offload = true;