diff options
| author | Eric Herrmann <eherrmann@chromium.org> | 2021-03-03 12:32:59 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-04 00:35:27 +0000 |
| commit | 8fffb7f40b72742551a343209a97a7a9add6a827 (patch) | |
| tree | 7c98297003a29e66a730c10f109ad06a534b40be /driver | |
| parent | 8be85441500e7b44daaeafeb138383e7ac656062 (diff) | |
| download | chrome-ec-8fffb7f40b72742551a343209a97a7a9add6a827.tar.gz | |
TCPMv1/v2: Move SOP' enabling to tcpm_set_vconn
Currently SOP' enabling is done as part of the TCPCI driver when vconn
is set - however if we aren't using VCONN from the TCPC, we need to
enable SOP' separately. So, instead of enabling it in the TCPCI driver,
enable it in the general TCPM set VCONN function.
BUG=b:181692098,b:181691263,b:173459141
TEST=Make sure cable discovery works
TEST=make buildall
BRANCH=None
Signed-off-by: Eric Herrmann <eherrmann@chromium.org>
Change-Id: Iecc06760f2b8af588c427b9565c6aa31ee719edf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2733574
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/tcpm/tcpci.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c index 36f4cf4085..24a24d45df 100644 --- a/driver/tcpm/tcpci.c +++ b/driver/tcpm/tcpci.c @@ -645,12 +645,6 @@ int tcpci_tcpm_set_vconn(int port, int enable) if (rv) return rv; - if (IS_ENABLED(CONFIG_USB_PD_DECODE_SOP)) { - rv = tcpci_tcpm_sop_prime_enable(port, enable); - if (rv) - return rv; - } - reg &= ~TCPC_REG_POWER_CTRL_VCONN(1); reg |= TCPC_REG_POWER_CTRL_VCONN(enable); return tcpc_write(port, TCPC_REG_POWER_CTRL, reg); |