Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-release

Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release

Relevant changes:

git log --oneline 63a8a1366e..a46d3f3fea -- board/nocturne_fp
board/dartmonkey common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh

981fb88cf8 docs/fingerprint: Resolve contradictory FPMCU factory flashing instructions
60032a8828 docs/fingerprint: Clean up formatting in fingerprint-factory-quick-guide.md
f49eb6f894 docs/fingerprint: Run mdformat
64aa5fc7bb docs/fingerprint: Add links to info on fuzz testing
8bd99cc434 fpsensor: Use correct return type
2b2d7a991d fpsensor: Use correct return type

BRANCH=None
BUG=b:234772776 b:234181908
TEST=`make -j buildall`

Cq-Include-Trybots: chromeos/cq:cq-orchestrator
Signed-off-by: Firas Sammoura <fsammoura@google.com>
Change-Id: I1714a77d292aad81bdc71982c88b2b067cfdada7

1 files changed, 67 insertions, 10 deletions

diff --git a/board/agah/usbc_config.c b/board/agah/usbc_config.c
index d3d20c96c5..0902f2f799 100644
--- a/board/agah/usbc_config.c
+++ b/board/agah/usbc_config.c
@@ -14,6 +14,7 @@
 #include "console.h"
 #include "driver/bc12/pi3usb9201_public.h"
 #include "driver/ppc/syv682x_public.h"
+#include "driver/retimer/ps8818.h"
 #include "driver/tcpm/rt1715.h"
 #include "driver/tcpm/tcpci.h"
 #include "ec_commands.h"
@@ -85,30 +86,86 @@ struct ppc_config_t ppc_chips[] = {
 
 unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips);
 
-/* USBC mux configuration - Alder Lake includes internal mux */
-static const struct usb_mux usbc0_tcss_usb_mux = {
-	.usb_port = USBC_PORT_C0,
-	.driver = &virtual_usb_mux_driver,
-	.hpd_update = &virtual_hpd_update,
+const static struct ps8818_reg_val equalizer_default_table[] = {
+	{
+		.reg = PS8818_REG1_APTX1EQ_10G_LEVEL,
+		.mask = PS8818_EQ_LEVEL_UP_MASK,
+		.val = PS8818_EQ_LEVEL_UP_19DB,
+	},
+	{
+		.reg = PS8818_REG1_APTX2EQ_10G_LEVEL,
+		.mask = PS8818_EQ_LEVEL_UP_MASK,
+		.val = PS8818_EQ_LEVEL_UP_19DB,
+	},
+	{
+		.reg = PS8818_REG1_APTX1EQ_5G_LEVEL,
+		.mask = PS8818_EQ_LEVEL_UP_MASK,
+		.val = PS8818_EQ_LEVEL_UP_19DB,
+	},
+	{
+		.reg = PS8818_REG1_APTX2EQ_5G_LEVEL,
+		.mask = PS8818_EQ_LEVEL_UP_MASK,
+		.val = PS8818_EQ_LEVEL_UP_19DB,
+	},
+	{
+		.reg = PS8818_REG1_RX_PHY,
+		.mask = PS8818_RX_INPUT_TERM_MASK,
+		.val = PS8818_RX_INPUT_TERM_112_OHM,
+	},
 };
-static const struct usb_mux usbc2_tcss_usb_mux = {
+
+#define NUM_EQ_DEFAULT_ARRAY ARRAY_SIZE(equalizer_default_table)
+
+int board_ps8818_mux_set(const struct usb_mux *me,
+				    mux_state_t mux_state)
+{
+	int rv = EC_SUCCESS;
+	int i;
+
+	/* USB specific config */
+	if (mux_state & USB_PD_MUX_USB_ENABLED) {
+
+		/* Boost the USB gain */
+		for (i = 0; i < NUM_EQ_DEFAULT_ARRAY; i++)
+			rv |= ps8818_i2c_field_update8(me, PS8818_REG_PAGE1,
+				equalizer_default_table[i].reg,
+				equalizer_default_table[i].mask,
+				equalizer_default_table[i].val);
+	}
+
+	/* DP specific config */
+	if (mux_state & USB_PD_MUX_DP_ENABLED) {
+		/* Boost the DP gain */
+		rv |= ps8818_i2c_field_update8(me,
+					PS8818_REG_PAGE1,
+					PS8818_REG1_DPEQ_LEVEL,
+					PS8818_DPEQ_LEVEL_UP_MASK,
+					PS8818_DPEQ_LEVEL_UP_19DB);
+	}
+
+	return rv;
+}
+
+const static struct usb_mux usbc2_ps8818 = {
 	.usb_port = USBC_PORT_C2,
-	.driver = &virtual_usb_mux_driver,
-	.hpd_update = &virtual_hpd_update,
+	.i2c_port = I2C_PORT_USB_C2_TCPC,
+	.i2c_addr_flags = PS8818_I2C_ADDR_FLAGS,
+	.driver = &ps8818_usb_retimer_driver,
+	.board_set = &board_ps8818_mux_set,
 };
 
+/* USBC mux configuration - Alder Lake includes internal mux */
 const struct usb_mux usb_muxes[] = {
 	[USBC_PORT_C0] = {
 		.usb_port = USBC_PORT_C0,
 		.driver = &virtual_usb_mux_driver,
 		.hpd_update = &virtual_hpd_update,
-		.next_mux = &usbc0_tcss_usb_mux,
 	},
 	[USBC_PORT_C2] = {
 		.usb_port = USBC_PORT_C2,
 		.driver = &virtual_usb_mux_driver,
 		.hpd_update = &virtual_hpd_update,
-		.next_mux = &usbc2_tcss_usb_mux,
+		.next_mux = &usbc2_ps8818,
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT);