[S] Change in coreboot[main]: mb/google/nissa/var/teliks: Add fw_config fields for rtl8852be

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84138?usp=email )

Change subject: mb/google/nissa/var/teliks: Add fw_config fields for rtl8852be
......................................................................

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) 
---
M src/mainboard/google/brya/variants/teliks/overridetree.cb
M src/mainboard/google/brya/variants/teliks/variant.c
2 files changed, 8 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Qinghong Zeng: Looks good to me, but someone else must approve
  Eric Lai: Looks good to me, approved
  Subrata Banik: Looks good to me, approved

diff --git a/src/mainboard/google/brya/variants/teliks/overridetree.cb b/src/mainboard/google/brya/variants/teliks/overridetree.cb
index 2f4534f..d2603f1 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 @@
    			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 @@
    					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 3f7cfd6..7e0f02d 100644
--- a/src/mainboard/google/brya/variants/teliks/variant.c
+++ b/src/mainboard/google/brya/variants/teliks/variant.c
@@ -35,7 +35,8 @@

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));