diff options
| author | Edward Hill <ecgh@chromium.org> | 2019-08-14 15:31:11 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-23 18:12:17 +0000 |
| commit | bd751b403f996c603f28f20810a8fa2bf257553e (patch) | |
| tree | 12fe529f074cc80d114a4dc2b6d89d368eb7851f /baseboard | |
| parent | 7b7f7b136e58429a8afd6f41ee11cd105baefeba (diff) | |
| download | chrome-ec-bd751b403f996c603f28f20810a8fa2bf257553e.tar.gz | |
usb_mux: Add driver for AMD FP5 USB/DP Mux
BUG=b:138600585
BRANCH=none
TEST=build
Change-Id: I547309c7000e7d3ca8549a7e626a63789665305d
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1868921
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'baseboard')
| -rw-r--r-- | baseboard/zork/baseboard.c | 5 | ||||
| -rw-r--r-- | baseboard/zork/baseboard.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index 0bf187ee90..4f63cfb006 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -130,7 +130,7 @@ const struct i2c_port_t i2c_ports[] = { }, { .name = "mux", - .port = I2C_PORT_MUX, + .port = I2C_PORT_USB_MUX, .kbps = 400, .scl = GPIO_EC_I2C_USBC_AP_MUX_SCL, .sda = GPIO_EC_I2C_USBC_AP_MUX_SDA, @@ -458,8 +458,7 @@ void bc12_interrupt(enum gpio_signal signal) struct usb_mux usb_muxes[] = { [USBC_PORT_C0] = { - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, + .driver = &amd_fp5_usb_mux_driver, }, [USBC_PORT_C1] = { .driver = &tcpci_tcpm_usb_mux_driver, diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index 9f8ab6b8d4..af3f0f8d04 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -141,6 +141,7 @@ #define CONFIG_USBC_SS_MUX_DFP_ONLY #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP +#define CONFIG_USB_MUX_AMD_FP5 #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ @@ -174,7 +175,7 @@ #define I2C_PORT_BATTERY NPCX_I2C_PORT2_0 #define I2C_PORT_CHARGER NPCX_I2C_PORT2_0 #define I2C_PORT_EEPROM NPCX_I2C_PORT2_0 -#define I2C_PORT_MUX NPCX_I2C_PORT3_0 +#define I2C_PORT_USB_MUX NPCX_I2C_PORT3_0 #define I2C_PORT_THERMAL NPCX_I2C_PORT4_1 #define I2C_PORT_SENSOR NPCX_I2C_PORT5_0 #define I2C_PORT_ACCEL NPCX_I2C_PORT5_0 |