From 0c0663b5e82001043906ce39191818c354d4e7cb Mon Sep 17 00:00:00 2001 From: cengjianeng Date: Fri, 30 Aug 2024 13:02:13 +0800 Subject: mb/google/nissa/var/teliks: Add fw_config fields for rtl8852be Add a new fw config field for wifi category as WIFI_6_8852, which is PCIe based. Also, enable WIFI_6_8852 for existing PCIe based wifi port as well as bluetooth port. BUG=b:356434907 BRANCH=NONE TEST=Verified Wifi6 module detection Change-Id: Ib6ba641c23cce7f1253022c9bb78b986b323bcaa Signed-off-by: Jianeng Ceng Reviewed-on: https://review.coreboot.org/c/coreboot/+/84138 Reviewed-by: Eric Lai Reviewed-by: Subrata Banik Reviewed-by: Qinghong Zeng Tested-by: build bot (Jenkins) --- src/mainboard/google/brya/variants/teliks/overridetree.cb | 9 ++++++--- src/mainboard/google/brya/variants/teliks/variant.c | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/mainboard/google/brya/variants/teliks/overridetree.cb b/src/mainboard/google/brya/variants/teliks/overridetree.cb index 2f4534f0df..d2603f1189 100644 --- a/src/mainboard/google/brya/variants/teliks/overridetree.cb +++ b/src/mainboard/google/brya/variants/teliks/overridetree.cb @@ -1,8 +1,9 @@ fw_config field WIFI 8 9 option UNKNOWN 0 - option WIFI_6 1 + option WIFI_6_7921 1 option WIFI_6E 2 + option WIFI_6_8852 3 end field CAMERA 10 11 option UF_720P_WF 0 @@ -406,7 +407,8 @@ chip soc/intel/alderlake register "wake" = "GPE0_DW1_03" register "add_acpi_dma_property" = "true" device pci 00.0 on - probe WIFI WIFI_6 + probe WIFI WIFI_6_7921 + probe WIFI WIFI_6_8852 end end end @@ -511,7 +513,8 @@ chip soc/intel/alderlake register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D4)" device ref usb2_port8 on - probe WIFI WIFI_6 + probe WIFI WIFI_6_7921 + probe WIFI WIFI_6_8852 end end chip drivers/usb/acpi diff --git a/src/mainboard/google/brya/variants/teliks/variant.c b/src/mainboard/google/brya/variants/teliks/variant.c index 3f7cfd6e23..7e0f02dead 100644 --- a/src/mainboard/google/brya/variants/teliks/variant.c +++ b/src/mainboard/google/brya/variants/teliks/variant.c @@ -35,7 +35,8 @@ void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) void fw_config_gpio_padbased_override(struct pad_config *padbased_table) { - if (fw_config_probe(FW_CONFIG(WIFI, WIFI_6))) { + if (fw_config_probe(FW_CONFIG(WIFI, WIFI_6_7921)) + || fw_config_probe(FW_CONFIG(WIFI, WIFI_6_8852))) { printk(BIOS_INFO, "Enable PCie based Wifi GPIO pins.\n"); gpio_padbased_override(padbased_table, wifi_pcie_enable_pad, ARRAY_SIZE(wifi_pcie_enable_pad)); -- cgit v1.2.3