soc/intel/alderlake: Set UsbTcPortEn based on tcss_port[x]

UsbTcPortEn is configured based on pointers to tcss_usb3_port1,
which is part of the ACPI driver.

This is illogical, as the port might need to be enabled, and
the ACPI not needed or included. Change this so it's configured
based on the tcss_port[x] in devicetree.

Tested by connecting a USB 3.0 hub, and checking that Linux
correctly identifies a new USB 3.0 device.

Change-Id: I07ef0759057f7f40210766a73643c9ccf1dc986d
Signed-off-by: Sean Rhodes <sean@starlabs.systems>

src/ec/system76/ec/acpi/s76.asl

@@ -146,6 +146,10 @@ Device (S76D) {
 				Local1 = ^^PCI0.LPCB.EC0.RPM2
 			}
 		}
+		If (Local1 != 0) {
+			// 60 * (EC frequency / 120) / 2
+			Local1 = 2156250 / Local1
+		}
 		Return ((Local1 << 8) | Local0)
 	}
 

src/mainboard/system76/mtl/Kconfig

@@ -45,6 +45,13 @@ config BOARD_SYSTEM76_LEMP13
 	select SOC_INTEL_METEORLAKE_U_H
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
 
+config BOARD_SYSTEM76_LEMP13_B
+	select BOARD_SYSTEM76_MTL_COMMON
+	select DRIVERS_I2C_TAS5825M
+	select HAVE_SPD_IN_CBFS
+	select SOC_INTEL_METEORLAKE_U_H
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+
 if BOARD_SYSTEM76_MTL_COMMON
 
 config MAINBOARD_DIR
@@ -52,7 +59,7 @@ config MAINBOARD_DIR
 
 config VARIANT_DIR
 	default "darp10" if BOARD_SYSTEM76_DARP10 || BOARD_SYSTEM76_DARP10_B
-	default "lemp13" if BOARD_SYSTEM76_LEMP13
+	default "lemp13" if BOARD_SYSTEM76_LEMP13 || BOARD_SYSTEM76_LEMP13_B
 
 config OVERRIDE_DEVICETREE
 	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
@@ -61,15 +68,17 @@ config MAINBOARD_PART_NUMBER
 	default "darp10" if BOARD_SYSTEM76_DARP10
 	default "darp10-b" if BOARD_SYSTEM76_DARP10_B
 	default "lemp13" if BOARD_SYSTEM76_LEMP13
+	default "lemp13-b" if BOARD_SYSTEM76_LEMP13_B
 
 config MAINBOARD_SMBIOS_PRODUCT_NAME
 	default "Darter Pro" if BOARD_SYSTEM76_DARP10 || BOARD_SYSTEM76_DARP10_B
-	default "Lemur Pro" if BOARD_SYSTEM76_LEMP13
+	default "Lemur Pro" if BOARD_SYSTEM76_LEMP13 || BOARD_SYSTEM76_LEMP13_B
 
 config MAINBOARD_VERSION
 	default "darp10" if BOARD_SYSTEM76_DARP10
 	default "darp10-b" if BOARD_SYSTEM76_DARP10_B
 	default "lemp13" if BOARD_SYSTEM76_LEMP13
+	default "lemp13-b" if BOARD_SYSTEM76_LEMP13_B
 
 config CMOS_DEFAULT_FILE
 	default "src/mainboard/\$(MAINBOARDDIR)/cmos.default"

src/mainboard/system76/mtl/Kconfig.name

@@ -8,3 +8,6 @@ config BOARD_SYSTEM76_DARP10_B
 
 config BOARD_SYSTEM76_LEMP13
 	bool "lemp13"
+
+config BOARD_SYSTEM76_LEMP13_B
+	bool "lemp13-b"

src/soc/intel/alderlake/fsp_params.c

@@ -652,13 +652,6 @@ WEAK_DEV_PTR(tcss_usb3_port4);
 static void fill_fsps_tcss_params(FSP_S_CONFIG *s_cfg,
 		const struct soc_intel_alderlake_config *config)
 {
-	const struct device *tcss_port_arr[] = {
-		DEV_PTR(tcss_usb3_port1),
-		DEV_PTR(tcss_usb3_port2),
-		DEV_PTR(tcss_usb3_port3),
-		DEV_PTR(tcss_usb3_port4),
-	};
-
 	s_cfg->TcssAuxOri = config->tcss_aux_ori;
 
 	/* Explicitly clear this field to avoid using defaults */
@@ -676,8 +669,8 @@ static void fill_fsps_tcss_params(FSP_S_CONFIG *s_cfg,
 	s_cfg->D3ColdEnable = CONFIG(D3COLD_SUPPORT);
 
 	s_cfg->UsbTcPortEn = 0;
-	for (int i = 0; i < MAX_TYPE_C_PORTS; i++) {
-		if (is_dev_enabled(tcss_port_arr[i]))
+	for (int i = 0; i < ARRAY_SIZE(config->tcss_ports); i++) {
+		if (config->tcss_ports[i].enable)
 			s_cfg->UsbTcPortEn |= BIT(i);
 	}