diff options
| author | Wai-Hong Tam <waihong@google.com> | 2018-10-15 14:22:46 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-01-11 13:32:24 -0800 |
| commit | d3e653e5d41cbadcf40c5449841b475708f18dc8 (patch) | |
| tree | 0d8138599315c73121e7fd0729c5c614f0a9795c /driver/tcpm/anx74xx.c | |
| parent | 7b99b74ba5463c886200ea827579f7ac1b6a35d2 (diff) | |
| download | chrome-ec-d3e653e5d41cbadcf40c5449841b475708f18dc8.tar.gz | |
anx74xx: Rename the registers to more meaningful
Rename the registers which configures the internal switches.
No logic change.
BRANCH=None
BUG=b:116879483
TEST=None. No logic change.
Change-Id: I10bcbc7d0da1b8e97be0811b8f3a188037c5d68c
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1282004
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Diffstat (limited to 'driver/tcpm/anx74xx.c')
| -rw-r--r-- | driver/tcpm/anx74xx.c | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/driver/tcpm/anx74xx.c b/driver/tcpm/anx74xx.c index 675c4b0bf0..178b56d4be 100644 --- a/driver/tcpm/anx74xx.c +++ b/driver/tcpm/anx74xx.c @@ -377,8 +377,8 @@ static int anx74xx_mux_aux_to_sbu(int port, int polarity, int enabled) static int anx74xx_tcpm_mux_set(int i2c_addr, mux_state_t mux_state) { - int reg; - int pin_cfg = 0; + int ctrl5; + int ctrl1 = 0; int rv; int port = i2c_addr; @@ -387,28 +387,36 @@ static int anx74xx_tcpm_mux_set(int i2c_addr, mux_state_t mux_state) return anx74xx_tcpm_mux_exit(port); } - rv = mux_read(port, ANX74XX_REG_ANALOG_CTRL_5, ®); + rv = mux_read(port, ANX74XX_REG_ANALOG_CTRL_5, &ctrl5); if (rv) return EC_ERROR_UNKNOWN; - reg &= 0x0f; + ctrl5 &= 0x0f; if (mux_state & MUX_USB_ENABLED) { /* Set pin assignment D */ if (mux_state & MUX_POLARITY_INVERTED) { - pin_cfg = ANX74XX_REG_MUX_DP_MODE_BDF_CC2; - reg |= ANX74XX_REG_MUX_SSTX_B; + ctrl1 = (ANX74XX_REG_MUX_ML0_RX1 | + ANX74XX_REG_MUX_ML1_TX1 | + ANX74XX_REG_MUX_SSRX_RX2); + ctrl5 |= ANX74XX_REG_MUX_SSTX_TX2; } else { - pin_cfg = ANX74XX_REG_MUX_DP_MODE_BDF_CC1; - reg |= ANX74XX_REG_MUX_SSTX_A; + ctrl1 = (ANX74XX_REG_MUX_ML0_RX2 | + ANX74XX_REG_MUX_ML1_TX2 | + ANX74XX_REG_MUX_SSRX_RX1); + ctrl5 |= ANX74XX_REG_MUX_SSTX_TX1; } } else if (mux_state & MUX_DP_ENABLED) { /* Set pin assignment C */ if (mux_state & MUX_POLARITY_INVERTED) { - pin_cfg = ANX74XX_REG_MUX_DP_MODE_ACE_CC2; - reg |= ANX74XX_REG_MUX_ML2_B; + ctrl1 = (ANX74XX_REG_MUX_ML0_RX1 | + ANX74XX_REG_MUX_ML1_TX1 | + ANX74XX_REG_MUX_ML3_RX2); + ctrl5 |= ANX74XX_REG_MUX_ML2_TX2; } else { - pin_cfg = ANX74XX_REG_MUX_DP_MODE_ACE_CC1; - reg |= ANX74XX_REG_MUX_ML2_A; + ctrl1 = (ANX74XX_REG_MUX_ML0_RX2 | + ANX74XX_REG_MUX_ML1_TX2 | + ANX74XX_REG_MUX_ML3_RX1); + ctrl5 |= ANX74XX_REG_MUX_ML2_TX1; } } else if (!mux_state) { return anx74xx_tcpm_mux_exit(port); @@ -425,9 +433,9 @@ static int anx74xx_tcpm_mux_set(int i2c_addr, mux_state_t mux_state) return EC_ERROR_UNKNOWN; /* Write updated pin assignment */ - rv = mux_write(port, ANX74XX_REG_ANALOG_CTRL_1, pin_cfg); + rv = mux_write(port, ANX74XX_REG_ANALOG_CTRL_1, ctrl1); /* Write Rswitch config bits */ - rv |= mux_write(port, ANX74XX_REG_ANALOG_CTRL_5, reg); + rv |= mux_write(port, ANX74XX_REG_ANALOG_CTRL_5, ctrl5); if (rv) return EC_ERROR_UNKNOWN; |