diff options
| author | Alec Berg <alecaberg@chromium.org> | 2015-06-25 14:54:31 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-30 17:18:31 +0000 |
| commit | 4114b7f1fe2274c0d1321cba8182ade8180599d9 (patch) | |
| tree | 0ecea72eb813a52c9b9b02c3f8be4a5192a7710a /common/usb_pd_tcpc.c | |
| parent | 82ec2510a3acebbf47f2c366e2eabff80d87cc07 (diff) | |
| download | chrome-ec-4114b7f1fe2274c0d1321cba8182ade8180599d9.tar.gz | |
tcpc: update tcpci registers to latest spec
Update TCPCI registers to version 0.62 of PD Interface
specification.
BUG=none
BRANCH=none
TEST=test on glados and samus
Change-Id: I57338b385123371e90f3b79b84e652af15be1bf1
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/282067
Reviewed-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'common/usb_pd_tcpc.c')
| -rw-r--r-- | common/usb_pd_tcpc.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index 1d12620969..54e3ceeca7 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -678,7 +678,7 @@ static int cc_voltage_to_status(int port, int cc_volt) else if (CC_RA(cc_volt)) return TYPEC_CC_VOLT_RA; else - return TYPEC_CC_VOLT_SNK_DEF; + return TYPEC_CC_VOLT_RD; /* If we have a pull-down, then we are sink, check for Rp. */ } #ifdef CONFIG_USB_PD_DUAL_ROLE @@ -1000,17 +1000,12 @@ static int tcpc_i2c_read(int port, int reg, uint8_t *payload) case TCPC_REG_VENDOR_ID: *(uint16_t *)payload = tcpc_vid; return 2; - case TCPC_REG_CC1_STATUS: + case TCPC_REG_CC_STATUS: tcpc_get_cc(port, &cc1, &cc2); payload[0] = TCPC_REG_CC_STATUS_SET( - pd[port].cc_pull == TYPEC_CC_RP ? - TYPEC_CC_TERM_RP_DEF : TYPEC_CC_TERM_RD, - pd[port].cc_status[0]); - payload[1] = TCPC_REG_CC_STATUS_SET( - pd[port].cc_pull == TYPEC_CC_RP ? - TYPEC_CC_TERM_RP_DEF : TYPEC_CC_TERM_RD, - pd[port].cc_status[1]); - return 2; + pd[port].cc_pull == TYPEC_CC_RD, + pd[port].cc_status[0], pd[port].cc_status[1]); + return 1; case TCPC_REG_ROLE_CTRL: payload[0] = TCPC_REG_ROLE_CTRL_SET(0, 0, pd[port].cc_pull, |