summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Brockus <dbrockus@google.com>2020-07-10 15:37:26 -0600
committerCommit Bot <commit-bot@chromium.org>2020-07-11 01:48:58 +0000
commit834aa957e6c3d3eb30e7760ef14ef722cf8009bd (patch)
tree59b5d43e027629e8e4dd29bd66930bc7791e6542
parentce32396e6cfbc3ee3a1911338e77816fddd2843d (diff)
downloadchrome-ec-834aa957e6c3d3eb30e7760ef14ef722cf8009bd.tar.gz
TCPMv2: Don't disable/enable AutoDischargeDisconnect on HardReset
This was a suggestion given that made sense but breaks our usage of SuzyQ. So putting this portion back to the way the code used to be. https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2250092 BUG=b:160855715,b:158751942 BRANCH=none TEST=verify SuzyQ connection Signed-off-by: Denis Brockus <dbrockus@google.com> Change-Id: Id2f102735f5cd2c7aa89a5cd94cc062d3888f417 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2293377 Tested-by: Denis Brockus <dbrockus@chromium.org> Auto-Submit: Denis Brockus <dbrockus@chromium.org> Reviewed-by: Edward Hill <ecgh@chromium.org> Commit-Queue: Edward Hill <ecgh@chromium.org>
-rw-r--r--common/usbc/usb_tc_drp_acc_trysrc_sm.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
index 467b5c3f3e..57670708a6 100644
--- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c
+++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
@@ -845,15 +845,6 @@ void tc_hard_reset_request(int port)
{
TC_SET_FLAG(port, TC_FLAGS_HARD_RESET_REQUESTED);
task_set_event(PD_PORT_TO_TASK_ID(port), PD_EVENT_SM, 0);
-
- /*
- * TCPCI Rev2 V1.1 4.4.5.4.4
- * Disconnect Detection by the Sink TCPC during a Connection
- *
- * Attached.SNK Hard Reset disable AutoDischargeDisconnect
- */
- if (IS_ATTACHED_SNK(port))
- tcpm_enable_auto_discharge_disconnect(port, 0);
}
void tc_disc_ident_in_progress(int port)
@@ -1190,15 +1181,6 @@ static bool tc_perform_snk_hard_reset(int port)
pe_ps_reset_complete(port);
/*
- * TCPCI Rev2 V1.1 4.4.5.4.4
- * Disconnect Detection by the Sink TCPC during a
- * Connection
- *
- * HardReset done - enable AutoDischargeDisconnect
- */
- tcpm_enable_auto_discharge_disconnect(port, 1);
-
- /*
* Now that VBUS is back, let's notify charge manager
* regarding the source's current capabilities.
* sink_power_sub_states() reacts to changes in CC