Merge remote-tracking branch cros/main into firmware-brya-14505.B-mainfirmware-brya-14505.B-main

Generated by: util/update_release_branch.py --board brya firmware-brya-14505.B-main

Relevant changes:

git log --oneline 8641442366..b34dc2ae90 -- board/brya board/brya
util/getversion.sh

BRANCH=None

TEST=`make -j buildall`

Force-Relevant-Builds: all
Change-Id: I63149b4c1782b3ed57f2556755901c21f5f1e3e9
Signed-off-by: Ivan Chen <yulunchen@google.com>

3 files changed, 11 insertions, 18 deletions

diff --git a/zephyr/program/corsola/src/npcx_usbc.c b/zephyr/program/corsola/src/npcx_usbc.c
index 2e1d8d11c5..8e9cd09e55 100644
--- a/zephyr/program/corsola/src/npcx_usbc.c
+++ b/zephyr/program/corsola/src/npcx_usbc.c
@@ -179,9 +179,13 @@ int board_vbus_source_enabled(int port)
 #if CONFIG_USB_PD_PORT_MAX_COUNT > 1
 __override int board_rt1718s_set_snk_enable(int port, int enable)
 {
-	if (port == USBC_PORT_C1) {
-		rt1718s_gpio_set_level(port, GPIO_EN_USB_C1_SINK, enable);
-	}
+	rt1718s_gpio_set_level(port, GPIO_EN_USB_C1_SINK, enable);
+
+	return EC_SUCCESS;
+}
+__override int board_rt1718s_set_src_enable(int port, int enable)
+{
+	rt1718s_gpio_set_level(port, GPIO_EN_USB_C1_SOURCE, enable);
 
 	return EC_SUCCESS;
 }
diff --git a/zephyr/program/corsola/src/usb_pd_policy.c b/zephyr/program/corsola/src/usb_pd_policy.c
index 30ded99aba..4b7e46cb74 100644
--- a/zephyr/program/corsola/src/usb_pd_policy.c
+++ b/zephyr/program/corsola/src/usb_pd_policy.c
@@ -229,12 +229,6 @@ void pd_power_supply_reset(int port)
 
 	prev_en = ppc_is_sourcing_vbus(port);
 
-#if defined(CONFIG_USB_PD_TCPM_RT1718S) && CONFIG_USB_PD_PORT_MAX_COUNT > 1
-	if (port == USBC_PORT_C1) {
-		rt1718s_gpio_set_level(port, GPIO_EN_USB_C1_SOURCE, 0);
-	}
-#endif
-
 	/* Disable VBUS. */
 	ppc_vbus_source_enable(port, 0);
 
@@ -254,13 +248,6 @@ int pd_set_power_supply_ready(int port)
 
 	pd_set_vbus_discharge(port, 0);
 
-#if defined(CONFIG_USB_PD_TCPM_RT1718S) && CONFIG_USB_PD_PORT_MAX_COUNT > 1
-	/* Provide Vbus. */
-	if (port == USBC_PORT_C1) {
-		rt1718s_gpio_set_level(port, GPIO_EN_USB_C1_SOURCE, 1);
-	}
-#endif
-
 	RETURN_ERROR(ppc_vbus_source_enable(port, 1));
 
 	/* Notify host of power info change. */
diff --git a/zephyr/program/corsola/src/usbc.c b/zephyr/program/corsola/src/usbc.c
index 71c02ff54f..871c84a2e4 100644
--- a/zephyr/program/corsola/src/usbc.c
+++ b/zephyr/program/corsola/src/usbc.c
@@ -45,7 +45,7 @@ DECLARE_HOOK(HOOK_INIT, baseboard_init, HOOK_PRIO_PRE_DEFAULT);
 
 __override uint8_t board_get_usb_pd_port_count(void)
 {
-	/* This function returns the PORT_COUNT+1 when HDMI db is connected.
+	/* This function returns the PORT_COUNT when HDMI db is connected.
 	 * This is a trick to ensure the usb_mux_set being set properley.
 	 * HDMI display functions using the USB virtual mux to * communicate
 	 * with the DP bridge.
@@ -56,6 +56,8 @@ __override uint8_t board_get_usb_pd_port_count(void)
 		} else {
 			return CONFIG_USB_PD_PORT_MAX_COUNT - 1;
 		}
+	} else if (corsola_get_db_type() == CORSOLA_DB_NONE) {
+		return CONFIG_USB_PD_PORT_MAX_COUNT - 1;
 	}
 
 	return CONFIG_USB_PD_PORT_MAX_COUNT;
@@ -65,7 +67,7 @@ uint8_t board_get_adjusted_usb_pd_port_count(void)
 {
 	const enum corsola_db_type db = corsola_get_db_type();
 
-	if (db == CORSOLA_DB_TYPEC || db == CORSOLA_DB_NONE) {
+	if (db == CORSOLA_DB_TYPEC || db == CORSOLA_DB_NO_DETECTION) {
 		return CONFIG_USB_PD_PORT_MAX_COUNT;
 	} else {
 		return CONFIG_USB_PD_PORT_MAX_COUNT - 1;