diff options
| author | Vijay Hiremath <vijay.p.hiremath@intel.com> | 2017-08-11 12:34:31 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-08-11 20:10:23 -0700 |
| commit | a261390d75d59ccacd6c439040d5e4e80df5cad3 (patch) | |
| tree | ce27f0190006682ed3edcb363b76a34d57a12227 /board | |
| parent | d4a8c130f754bd4978e074d4a5c4c9d52283d334 (diff) | |
| download | chrome-ec-a261390d75d59ccacd6c439040d5e4e80df5cad3.tar.gz | |
usb_mux: Merge PS8743 & PS8740 as PS874X
Merge PS8743 & PS8740 as PS874X as both the drivers are almost same.
BUG=b:64598680
BRANCH=glkrvp
TEST=make buildall -j
On GLKRVP, verify mux setting is correct with
Apple dongle (VGA + USB) and Pluggable adapter.
Change-Id: Ic6d31979936ee213b07c4c71859809102ee91452
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/612209
Commit-Ready: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Tested-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/chell/board.c | 18 | ||||
| -rw-r--r-- | board/glados/board.c | 2 | ||||
| -rw-r--r-- | board/oak/board.c | 2 | ||||
| -rw-r--r-- | board/reef_it8320/board.c | 2 | ||||
| -rw-r--r-- | board/wheatley/board.c | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/board/chell/board.c b/board/chell/board.c index e8c013353c..6637e56543 100644 --- a/board/chell/board.c +++ b/board/chell/board.c @@ -20,7 +20,6 @@ #include "keyboard_scan.h" #include "lid_switch.h" #include "pi3usb9281.h" -#include "ps8740.h" #include "power.h" #include "power_button.h" #include "pwm.h" @@ -35,6 +34,7 @@ #include "uart.h" #include "usb_charge.h" #include "usb_mux.h" +#include "usb_mux_ps874x.h" #include "usb_pd.h" #include "usb_pd_tcpm.h" #include "util.h" @@ -169,12 +169,12 @@ struct pi3usb9281_config pi3usb9281_chips[] = { BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) == CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT); -static int ps8740_tune_mux(const struct usb_mux *mux) +static int ps874x_tune_mux(const struct usb_mux *mux) { /* Apply same USB EQ settings to both Type-C mux */ - ps8740_tune_usb_eq(mux->port_addr, - PS8740_USB_EQ_TX_6_5_DB, - PS8740_USB_EQ_RX_14_3_DB); + ps874x_tune_usb_eq(mux->port_addr, + PS874X_USB_EQ_TX_6_5_DB, + PS874X_USB_EQ_RX_14_3_DB); return EC_SUCCESS; } @@ -182,13 +182,13 @@ static int ps8740_tune_mux(const struct usb_mux *mux) struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { { .port_addr = 0x34, - .driver = &ps8740_usb_mux_driver, - .board_init = &ps8740_tune_mux, + .driver = &ps874x_usb_mux_driver, + .board_init = &ps874x_tune_mux, }, { .port_addr = 0x20, - .driver = &ps8740_usb_mux_driver, - .board_init = &ps8740_tune_mux, + .driver = &ps874x_usb_mux_driver, + .board_init = &ps874x_tune_mux, } }; diff --git a/board/glados/board.c b/board/glados/board.c index 930a7f8a7d..893d3c32db 100644 --- a/board/glados/board.c +++ b/board/glados/board.c @@ -167,7 +167,7 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { }, { .port_addr = 0x20, - .driver = &ps8740_usb_mux_driver, + .driver = &ps874x_usb_mux_driver, } }; diff --git a/board/oak/board.c b/board/oak/board.c index 0c8af7b2ba..704c287c11 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -173,7 +173,7 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { #else { .port_addr = 0x20, - .driver = &ps8740_usb_mux_driver, + .driver = &ps874x_usb_mux_driver, }, #endif }; diff --git a/board/reef_it8320/board.c b/board/reef_it8320/board.c index e2abb87957..101deb2baf 100644 --- a/board/reef_it8320/board.c +++ b/board/reef_it8320/board.c @@ -177,7 +177,7 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { }, { .port_addr = 0x20, - .driver = &ps8740_usb_mux_driver, + .driver = &ps874x_usb_mux_driver, .hpd_update = &it83xx_tcpc_update_hpd_status, }, }; diff --git a/board/wheatley/board.c b/board/wheatley/board.c index 79903a505a..88f39d2bc7 100644 --- a/board/wheatley/board.c +++ b/board/wheatley/board.c @@ -167,7 +167,7 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { }, { .port_addr = 0x20, - .driver = &ps8740_usb_mux_driver, + .driver = &ps874x_usb_mux_driver, } }; |