[S] Change in coreboot[main]: mb/google/nissa/var/guren: Add WFC for AZWAVE/AM-3BA5533-B module

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/87054?usp=email )

Change subject: mb/google/nissa/var/guren: Add WFC for AZWAVE/AM-3BA5533-B module
......................................................................

mb/google/nissa/var/guren: Add WFC for AZWAVE/AM-3BA5533-B module

New WFC function for Guren360 project.
ID of Vendor and Product for AZWAVE/AM-3BA5533-B module are 13d3:5533.
1. Add WFC fw_config setting
2. Used USB2 Port7 for WFC

BUG=b:406164678
BRANCH=firmware-nissa-15217.B
TEST=1. emerge-nissa coreboot chromeos-bootimage
     2. Verified with local build bios via command lsusb
        for 13d3:5533 and SSFC WFC enable

Change-Id: Ia2ab019fe76c503cc669ebf4aa8b3d7ae72269c1
Signed-off-by: Daniel Peng 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/87054
Tested-by: build bot (Jenkins) 
Reviewed-by: Eric Lai 
Reviewed-by: Jayvik Desai 
Reviewed-by: Daniel Peng 
Reviewed-by: Subrata Banik 
---
M src/mainboard/google/brya/variants/guren/overridetree.cb
M src/mainboard/google/brya/variants/guren/variant.c
2 files changed, 14 insertions(+), 2 deletions(-)

Approvals:
  Subrata Banik: Looks good to me, approved
  Eric Lai: Looks good to me, approved
  Jayvik Desai: Looks good to me, approved
  Daniel Peng: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified

diff --git a/src/mainboard/google/brya/variants/guren/overridetree.cb b/src/mainboard/google/brya/variants/guren/overridetree.cb
index 77ec260..8b1adb1 100644
--- a/src/mainboard/google/brya/variants/guren/overridetree.cb
+++ b/src/mainboard/google/brya/variants/guren/overridetree.cb
@@ -21,6 +21,10 @@
    	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 @@
    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 @@
    					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 c2c49f8..4949083 100644
--- a/src/mainboard/google/brya/variants/guren/variant.c
+++ b/src/mainboard/google/brya/variants/guren/variant.c
@@ -18,4 +18,9 @@
    	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;
+	}
 }