diff options
| author | Ting Shen <phoenixshen@google.com> | 2020-10-28 12:22:17 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-28 09:50:58 +0000 |
| commit | c9826aad176be771412d453f37bbc55714afc2b1 (patch) | |
| tree | 6209c4a97c4a09e387b2e9b1ba83f898553c55cf | |
| parent | 50d3642d81a7d4ef9aa249d88843c29e52cf3aa3 (diff) | |
| download | chrome-ec-c9826aad176be771412d453f37bbc55714afc2b1.tar.gz | |
ps874x: fix incorrect parameter name in ps874x_tune_usb_eq
First parameter was incorrectly named 'i2c_addr' in header file,
but it's actually a 'port' in the implementation.
Change the parameter to a usb_mux* to avoid confusion, and also
align with other functions.
BUG=b:170703310
TEST=make
BRANCH=none
Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: Ic355b5fd03536423af841be731a93c818d87eb0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2504973
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | board/asurada/board.c | 2 | ||||
| -rw-r--r-- | driver/usb_mux/ps8740.c | 3 | ||||
| -rw-r--r-- | driver/usb_mux/ps8740.h | 2 | ||||
| -rw-r--r-- | driver/usb_mux/ps8743.c | 3 | ||||
| -rw-r--r-- | driver/usb_mux/ps8743.h | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/board/asurada/board.c b/board/asurada/board.c index 664b4a8df4..f046734b2c 100644 --- a/board/asurada/board.c +++ b/board/asurada/board.c @@ -414,7 +414,7 @@ const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { void board_usb_mux_init(void) { if (board_get_sub_board() == SUB_BOARD_TYPEC) - ps8743_tune_usb_eq(PS8743_I2C_ADDR0_FLAG, + ps8743_tune_usb_eq(&usb_muxes[1], PS8743_USB_EQ_TX_12_8_DB, PS8743_USB_EQ_RX_12_8_DB); } diff --git a/driver/usb_mux/ps8740.c b/driver/usb_mux/ps8740.c index b99c107610..4d03cb5cf3 100644 --- a/driver/usb_mux/ps8740.c +++ b/driver/usb_mux/ps8740.c @@ -106,10 +106,9 @@ static int ps8740_get_mux(const struct usb_mux *me, mux_state_t *mux_state) } /* Tune USB Tx/Rx Equalization */ -int ps8740_tune_usb_eq(int port, uint8_t tx, uint8_t rx) +int ps8740_tune_usb_eq(const struct usb_mux *me, uint8_t tx, uint8_t rx) { int ret; - const struct usb_mux *me = &usb_muxes[port]; ret = ps8740_write(me, PS8740_REG_USB_EQ_TX, tx); ret |= ps8740_write(me, PS8740_REG_USB_EQ_RX, rx); diff --git a/driver/usb_mux/ps8740.h b/driver/usb_mux/ps8740.h index 084719d03e..3a669b5ad9 100644 --- a/driver/usb_mux/ps8740.h +++ b/driver/usb_mux/ps8740.h @@ -84,7 +84,7 @@ #define PS8740_USB_EQ_RX_20_1_DB 0xd0 #define PS8740_USB_EQ_RX_21_3_DB 0xe0 -int ps8740_tune_usb_eq(int i2c_addr, uint8_t tx, uint8_t rx); +int ps8740_tune_usb_eq(const struct usb_mux *me, uint8_t tx, uint8_t rx); int ps8740_write(const struct usb_mux *me, uint8_t reg, uint8_t val); int ps8740_read(const struct usb_mux *me, uint8_t reg, int *val); diff --git a/driver/usb_mux/ps8743.c b/driver/usb_mux/ps8743.c index 3a9eb1ae40..264b79fecc 100644 --- a/driver/usb_mux/ps8743.c +++ b/driver/usb_mux/ps8743.c @@ -115,10 +115,9 @@ static int ps8743_get_mux(const struct usb_mux *me, mux_state_t *mux_state) } /* Tune USB Tx/Rx Equalization */ -int ps8743_tune_usb_eq(int port, uint8_t tx, uint8_t rx) +int ps8743_tune_usb_eq(const struct usb_mux *me, uint8_t tx, uint8_t rx) { int ret; - const struct usb_mux *me = &usb_muxes[port]; ret = ps8743_write(me, PS8743_REG_USB_EQ_TX, tx); ret |= ps8743_write(me, PS8743_REG_USB_EQ_RX, rx); diff --git a/driver/usb_mux/ps8743.h b/driver/usb_mux/ps8743.h index bd8db20167..bdb3e9a885 100644 --- a/driver/usb_mux/ps8743.h +++ b/driver/usb_mux/ps8743.h @@ -75,7 +75,7 @@ #define PS8743_USB_EQ_RX_21_3_DB 0xd0 #define PS8743_USB_EQ_RX_22_2_DB 0xe0 -int ps8743_tune_usb_eq(int i2c_addr, uint8_t tx, uint8_t rx); +int ps8743_tune_usb_eq(const struct usb_mux *me, uint8_t tx, uint8_t rx); int ps8743_write(const struct usb_mux *me, uint8_t reg, uint8_t val); int ps8743_read(const struct usb_mux *me, uint8_t reg, int *val); |