Merge remote-tracking branch cros/main into firmware-keeby-14119.B-mainfirmware-keeby-14119.B-main

Relevant changes:

git log --oneline c5bd23a4b..b44d10f8f -- baseboard/dedede board/cappy2
board/corori board/driblee board/gooey board/haboki board/lalala
board/waddledoo2 common/charge_state_v2.c common/mkbp_* common/ocpc.c
common/usbc/usb_tc_drp_acc_trysrc_sm.c common/usbc/usb_sm.c
common/usbc/*_pd_* common/usbc/dp_alt_mode.c common/usbc/usb_prl_sm.c
common/usbc/usb_pe_drp_sm.c common/usb_charger.c common/usb_common.c
common/usbc_ocp.c driver/charger/sm5803.* driver/charger/isl923x.*
driver/tcpm/raa489000.* driver/tcpm/it83* include/power/icelake.h
include/intel_x86.h power/icelake.c power/intel_x86.c util/getversion.sh

42d03a001 config: change temp_sensor_power from config to gpio
e296efb28 usb_common: Fix CONFIG_USB_PD_DISCHARGE_TCPC typo
c346481f4 atomic: cast to unsigned when shifting
9b972a0f2 driver/tcpm/it83xx, it8xxx2: ITE inactive port return from HOOK
a499d8fd4 driver/tcpm/it83xx, it8xxx2: set sleep mask for mixed TCPC case
ed62e2583 TCPMv2: don't set the sleep mask for TCPC embedded in EC
c962696e8 motion_sensor: Remove |int_signal| field
86b216794 ocpc: modify pre-charge target condition
6f8336eb4 dedede: Set MKBP event wake mask to 0
02d034df0 dedede: add stylus fw_config
4f7cd7509 atomic: use atomic_t where it is possible
e3ffa0519 mkbp: change the type fifo_entries to atomic_t
bb4c47af0 usb: use atomic_t where possible
c6e513ee2 power/icelake: Add SLP_S5 as a watched power signal
d89e49b20 power: Introduce S4 as a real power state
ba8a3c9c0 chgstv2: Use chipset_in_state instead of naming states
23a975d12 i2c: Use declared initializers for i2c_ports: boards a-l
35865dbec TCPMv2: Guard DATA_RESET using CONFIG_USB_PD_DATA_RESET_MSG
d4d8243ed i2c: Use declared initializers for i2c_ports: baseboards
eba8d0305 RAA489000: Fixed RAA489000 max charging current
e78b83e0f TCPMv2: Delay Data Reset until mode entry request
6230e60fc TCPMv2: Support Data Reset as DFP, initiator
412246836 intel_x86: Apply chipset resume init and suspend complete hooks
f2809b72c config: rename CONFIG_HOSTCMD_ESPI to CONFIG_HOST_INTERFACE_ESPI

BRANCH=None
BUG=b:202796060 b:207805856 b:167983049 b:208318528 b:181983966
BUG=b:207328258 b:195416058 b:205285137 b:199919093 b:207055975
BUG=b:129159505 b:204947672 b:141363146 b:207082842 b:205675485
TEST=`make -j buildall`

Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: I980351977e11088a130e478df0701be4715f049b

1 files changed, 49 insertions, 22 deletions

diff --git a/driver/usb_mux/tusb1064.c b/driver/usb_mux/tusb1064.c
index c236e3d1ab..d0e8678039 100644
--- a/driver/usb_mux/tusb1064.c
+++ b/driver/usb_mux/tusb1064.c
@@ -14,12 +14,6 @@
 #error "Must choose CONFIG_USB_MUX_TUSB1044 or CONFIG_USB_MUX_TUSB1064"
 #endif
 
-/*
- * configuration bits which never change in the General Register
- * e.g. REG_GENERAL_DP_EN_CTRL or REG_GENERAL_EQ_OVERRIDE
- */
-#define REG_GENERAL_STATIC_BITS REG_GENERAL_EQ_OVERRIDE
-
 static int tusb1064_read(const struct usb_mux *me, uint8_t reg, uint8_t *val)
 {
 	int buffer = 0xee;
@@ -36,11 +30,15 @@ static int tusb1064_write(const struct usb_mux *me, uint8_t reg, uint8_t val)
 }
 
 #if defined(CONFIG_USB_MUX_TUSB1044)
-void tusb1044_hpd_update(const struct usb_mux *me, mux_state_t mux_state)
+void tusb1044_hpd_update(const struct usb_mux *me, mux_state_t mux_state,
+			 bool *ack_required)
 {
 	int res;
 	uint8_t reg;
 
+	/* This driver does not use host command ACKs */
+	*ack_required = false;
+
 	res = tusb1064_read(me, TUSB1064_REG_GENERAL, &reg);
 	if (res)
 		return;
@@ -60,11 +58,54 @@ void tusb1044_hpd_update(const struct usb_mux *me, mux_state_t mux_state)
 }
 #endif
 
+int tusb1064_set_dp_rx_eq(const struct usb_mux *me, int db)
+{
+	uint8_t reg;
+	int rv;
+
+	if (db < TUSB1064_DP_EQ_RX_NEG_0_3_DB || db > TUSB1064_DP_EQ_RX_12_1_DB)
+		return EC_ERROR_INVAL;
+
+	/* Set the requested gain values */
+	reg = TUSB1064_DP1EQ(db) | TUSB1064_DP3EQ(db);
+	rv = tusb1064_write(me, TUSB1064_REG_DP1DP3EQ_SEL, reg);
+	if (rv)
+		return rv;
+
+	reg = TUSB1064_DP0EQ(db) | TUSB1064_DP2EQ(db);
+	rv = tusb1064_write(me, TUSB1064_REG_DP0DP2EQ_SEL, reg);
+	if (rv)
+		return rv;
+
+	/* Enable EQ_OVERRIDE so the gain registers are used */
+	rv = tusb1064_read(me, TUSB1064_REG_GENERAL, &reg);
+	if (rv)
+		return rv;
+
+	reg |= REG_GENERAL_EQ_OVERRIDE;
+
+	return tusb1064_write(me, TUSB1064_REG_GENERAL, reg);
+}
+
 /* Writes control register to set switch mode */
 static int tusb1064_set_mux(const struct usb_mux *me, mux_state_t mux_state,
 			    bool *ack_required)
 {
-	int reg = REG_GENERAL_STATIC_BITS;
+	uint8_t reg;
+	int rv;
+	int mask;
+
+	rv = tusb1064_read(me, TUSB1064_REG_GENERAL, &reg);
+	if (rv)
+		return rv;
+
+	/* Mask bits that may be set in this function */
+	mask = REG_GENERAL_CTLSEL_USB3 | REG_GENERAL_CTLSEL_ANYDP |
+		REG_GENERAL_FLIPSEL;
+#ifdef CONFIG_USB_MUX_TUSB1044
+	mask |= REG_GENERAL_HPDIN_OVERRIDE;
+#endif
+	reg &= ~mask;
 
 	/* This driver does not use host command ACKs */
 	*ack_required = false;
@@ -112,22 +153,8 @@ static int tusb1064_get_mux(const struct usb_mux *me, mux_state_t *mux_state)
 static int tusb1064_init(const struct usb_mux *me)
 {
 	int res;
-	uint8_t reg;
 	bool unused;
 
-	/* Default to "Floating Pin" DP Equalization */
-	reg = TUSB1064_DP1EQ(TUSB1064_DP_EQ_RX_10_0_DB) |
-		TUSB1064_DP3EQ(TUSB1064_DP_EQ_RX_10_0_DB);
-	res = tusb1064_write(me, TUSB1064_REG_DP1DP3EQ_SEL, reg);
-	if (res)
-		return res;
-
-	reg = TUSB1064_DP0EQ(TUSB1064_DP_EQ_RX_10_0_DB) |
-		TUSB1064_DP2EQ(TUSB1064_DP_EQ_RX_10_0_DB);
-	res = tusb1064_write(me, TUSB1064_REG_DP0DP2EQ_SEL, reg);
-	if (res)
-		return res;
-
 	/*
 	 * Note that bypassing the usb_mux API is okay for internal driver calls
 	 * since the task calling init already holds this port's mux lock.