diff options
| author | Edward Hill <ecgh@chromium.org> | 2020-04-15 17:47:23 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-16 06:14:12 +0000 |
| commit | 8ce48815d2b4522f171b5666ba3b974020380130 (patch) | |
| tree | 974eb6db3899f4df23f45e0d5a7b3fe589f80bf1 /baseboard | |
| parent | 57d7b7d45390d9bac51cadcc7d5349c830eaedb6 (diff) | |
| download | chrome-ec-8ce48815d2b4522f171b5666ba3b974020380130.tar.gz | |
Dalboz: Support PS8743 and PS8740 HW
BUG=b:153454399
BRANCH=none
TEST=PS8740 still works
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: Iaf09c4986b3a03ee2bf4c2408f6dd61ea64388af
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2151648
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'baseboard')
| -rw-r--r-- | baseboard/zork/baseboard.h | 3 | ||||
| -rw-r--r-- | baseboard/zork/variant_dalboz.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index 9d75896d10..e016f13cff 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -160,14 +160,15 @@ #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP #define CONFIG_USB_MUX_AMD_FP5 +#define CONFIG_USB_MUX_RUNTIME_CONFIG #if defined(VARIANT_ZORK_TREMBYLE) - #define CONFIG_USB_MUX_RUNTIME_CONFIG #define CONFIG_USBC_RETIMER_PS8802 #define CONFIG_USBC_RETIMER_PS8818 #define CONFIG_IO_EXPANDER_PORT_COUNT USBC_PORT_COUNT #elif defined(VARIANT_ZORK_DALBOZ) #define CONFIG_USB_MUX_PS8740 + #define CONFIG_USB_MUX_PS8743 #define CONFIG_IO_EXPANDER_PCAL6408 #define CONFIG_IO_EXPANDER_PORT_COUNT IOEX_PORT_COUNT #define CONFIG_USB_PORT_ENABLE_DYNAMIC diff --git a/baseboard/zork/variant_dalboz.c b/baseboard/zork/variant_dalboz.c index 4e14beb3c9..f25540dcf1 100644 --- a/baseboard/zork/variant_dalboz.c +++ b/baseboard/zork/variant_dalboz.c @@ -8,7 +8,7 @@ #include "driver/ioexpander/pcal6408.h" #include "driver/tcpm/nct38xx.h" #include "driver/usb_mux/amd_fp5.h" -#include "driver/usb_mux/ps8740.h" +#include "driver/usb_mux/ps8743.h" #include "gpio.h" #include "hooks.h" #include "i2c.h" @@ -189,7 +189,7 @@ struct usb_mux usbc1_amd_fp5_usb_mux = { .next_mux = &usbc1_hpd_mux, }; -const struct usb_mux usb_muxes[] = { +struct usb_mux usb_muxes[] = { [USBC_PORT_C0] = { .usb_port = USBC_PORT_C0, .i2c_port = I2C_PORT_USB_AP_MUX, @@ -200,8 +200,8 @@ const struct usb_mux usb_muxes[] = { [USBC_PORT_C1] = { .usb_port = USBC_PORT_C1, .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = PS8740_I2C_ADDR0_FLAG, - .driver = &ps8740_usb_mux_driver, + .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, + .driver = &ps8743_usb_mux_driver, .next_mux = &usbc1_amd_fp5_usb_mux, } }; |