diff options
author | Edward Hill <ecgh@chromium.org> | 2020-02-14 10:38:35 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-02-14 23:50:38 +0000 |
commit | b55607c5df6e4a8f1b80b5bcbb0a938b3674b464 (patch) | |
tree | 1618bfc6ee2f5539761dc0e42f2de4d347c61f93 /driver | |
parent | 27e3b57d2f37edd49b04bfa89ca6dd9c14c6c1ea (diff) | |
download | chrome-ec-b55607c5df6e4a8f1b80b5bcbb0a938b3674b464.tar.gz |
tcpci: Rename TCPC_FLAGS_TCPCI_V2_0 to TCPC_FLAGS_TCPCI_REV2_0
Align naming of TCPC_FLAGS_TCPCI_V2_0 to match spec:
"USB Type-C Port Controller Interface Specification"
"Revision 2.0, Version 1.0"
BUG=none
BRANCH=none
TEST=none
Change-Id: I27752847581e449c3a2f6be438704d3e514c937d
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2057375
Reviewed-by: Diana Z <dzigterman@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'driver')
-rw-r--r-- | driver/tcpm/raa489000.c | 2 | ||||
-rw-r--r-- | driver/tcpm/tcpci.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/driver/tcpm/raa489000.c b/driver/tcpm/raa489000.c index c6911eb913..5bd72a8e13 100644 --- a/driver/tcpm/raa489000.c +++ b/driver/tcpm/raa489000.c @@ -97,7 +97,7 @@ int raa489000_init(int port) /* Enable the correct TCPCI interface version */ rv = tcpc_read16(port, RAA489000_TCPC_SETTING1, ®val); - if (!(tcpc_config[port].flags & TCPC_FLAGS_TCPCI_V2_0)) + if (!(tcpc_config[port].flags & TCPC_FLAGS_TCPCI_REV2_0)) regval |= RAA489000_TCPCV1_0_EN; else regval &= ~RAA489000_TCPCV1_0_EN; diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c index b4d44e0a31..b4f33187cd 100644 --- a/driver/tcpm/tcpci.c +++ b/driver/tcpm/tcpci.c @@ -538,8 +538,8 @@ struct cached_tcpm_message { uint32_t payload[7]; }; -static int tcpci_v2_0_tcpm_get_message_raw(int port, uint32_t *payload, - int *head) +static int tcpci_rev2_0_tcpm_get_message_raw(int port, uint32_t *payload, + int *head) { int rv = 0, cnt, reg = TCPC_REG_RX_BUFFER; int frm; @@ -586,8 +586,8 @@ clear: return rv; } -static int tcpci_v1_0_tcpm_get_message_raw(int port, uint32_t *payload, - int *head) +static int tcpci_rev1_0_tcpm_get_message_raw(int port, uint32_t *payload, + int *head) { int rv, cnt, reg = TCPC_REG_RX_DATA; #ifdef CONFIG_USB_PD_DECODE_SOP @@ -635,10 +635,10 @@ clear: int tcpci_tcpm_get_message_raw(int port, uint32_t *payload, int *head) { - if (tcpc_config[port].flags & TCPC_FLAGS_TCPCI_V2_0) - return tcpci_v2_0_tcpm_get_message_raw(port, payload, head); + if (tcpc_config[port].flags & TCPC_FLAGS_TCPCI_REV2_0) + return tcpci_rev2_0_tcpm_get_message_raw(port, payload, head); - return tcpci_v1_0_tcpm_get_message_raw(port, payload, head); + return tcpci_rev1_0_tcpm_get_message_raw(port, payload, head); } /* Cache depth needs to be power of 2 */ @@ -744,9 +744,9 @@ int tcpci_tcpm_transmit(int port, enum tcpm_transmit_type type, TCPC_REG_TRANSMIT_SET_WITHOUT_RETRY(type)); } - if (tcpc_config[port].flags & TCPC_FLAGS_TCPCI_V2_0) { + if (tcpc_config[port].flags & TCPC_FLAGS_TCPCI_REV2_0) { /* - * In TCPCI v2.0, TX_BYTE_CNT and TX_BUF_BYTE_X are the same + * In TCPCI Rev 2.0, TX_BYTE_CNT and TX_BUF_BYTE_X are the same * register. */ reg = TCPC_REG_TX_BUFFER; @@ -1075,7 +1075,7 @@ int tcpci_tcpm_init(int port) * TCPC_CONTROL.EnableLooking4ConnectionAlert bit, TCPC by default masks * Alert assertion when CC_STATUS.Looking4Connection changes state. */ - if (tcpc_config[port].flags & TCPC_FLAGS_TCPCI_V2_0) { + if (tcpc_config[port].flags & TCPC_FLAGS_TCPCI_REV2_0) { error = tcpc_read(port, TCPC_REG_TCPC_CTRL, ®val); regval |= TCPC_REG_TCPC_CTRL_EN_LOOK4CONNECTION_ALERT; error |= tcpc_write(port, TCPC_REG_TCPC_CTRL, regval); |