From 3420cae8dda2f8088c32d52abbce5e9232154d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Wed, 25 Oct 2023 14:26:51 +0100 Subject: [PATCH] ANDROID: Revert "usb: typec: tcpm: not sink vbus if operational current is 0mA" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 803b1c8a0cea58cccde16eba31d285956f4c920c. Prevents Pixel from charging. Revert while we investigate the issue. Test: adb shell cat /sys/class/power_supply/battery/status Bug: 307718635 Change-Id: I9e8c6c62aac25cf41ac37c1d6bda696d8ecaf4aa Signed-off-by: André Draszik --- drivers/usb/typec/tcpm/tcpm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 72ead0384002..9cfc29e7358f 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -4267,9 +4267,7 @@ static void run_state_machine(struct tcpm_port *port) if (port->slow_charger_loop && (current_lim > PD_P_SNK_STDBY_MW / 5)) current_lim = PD_P_SNK_STDBY_MW / 5; tcpm_set_current_limit(port, current_lim, 5000); - /* Not sink vbus if operational current is 0mA */ - tcpm_set_charge(port, !!pdo_max_current(port->snk_pdo[0])); - + tcpm_set_charge(port, true); if (!port->pd_supported) tcpm_set_state(port, SNK_READY, 0); else @@ -4552,8 +4550,7 @@ static void run_state_machine(struct tcpm_port *port) tcpm_set_current_limit(port, tcpm_get_current_limit(port), 5000); - /* Not sink vbus if operational current is 0mA */ - tcpm_set_charge(port, !!pdo_max_current(port->snk_pdo[0])); + tcpm_set_charge(port, true); } if (port->ams == HARD_RESET) tcpm_ams_finish(port);