diff options
| author | Edward Hill <ecgh@chromium.org> | 2020-04-15 16:31:48 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-16 06:14:10 +0000 |
| commit | 57d7b7d45390d9bac51cadcc7d5349c830eaedb6 (patch) | |
| tree | afe2e0353658793a15215f3476c7a6c37832da5a /baseboard | |
| parent | 66272422f71c94bb7c5b31830a43e2ce1684a37c (diff) | |
| download | chrome-ec-57d7b7d45390d9bac51cadcc7d5349c830eaedb6.tar.gz | |
PS874x: Split PS8740 and PS8743
Split ps874x.[ch] into ps8740.[ch] and ps8743.[ch]
since we need to support both at runtime for Dalboz.
I left PS8742 in ps8740.[ch] since it is not very different.
BUG=b:153454399
BRANCH=none
TEST=make -j buildall
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: I92b02e08f377d1781c130a0bbe1482a936ad7a4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2151647
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 | 1 | ||||
| -rw-r--r-- | baseboard/zork/variant_dalboz.c | 5 | ||||
| -rw-r--r-- | baseboard/zork/variant_trembyle.c | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index be0040e518..9d75896d10 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -234,7 +234,6 @@ #endif #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define PS8743_I2C_ADDR_FLAGS 0x11 /* Sensors */ #define CONFIG_MKBP_EVENT diff --git a/baseboard/zork/variant_dalboz.c b/baseboard/zork/variant_dalboz.c index 41307d6da4..4e14beb3c9 100644 --- a/baseboard/zork/variant_dalboz.c +++ b/baseboard/zork/variant_dalboz.c @@ -8,6 +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 "gpio.h" #include "hooks.h" #include "i2c.h" @@ -199,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 = 0x10, - .driver = &ps874x_usb_mux_driver, + .i2c_addr_flags = PS8740_I2C_ADDR0_FLAG, + .driver = &ps8740_usb_mux_driver, .next_mux = &usbc1_amd_fp5_usb_mux, } }; diff --git a/baseboard/zork/variant_trembyle.c b/baseboard/zork/variant_trembyle.c index 0d131db677..c81a79802e 100644 --- a/baseboard/zork/variant_trembyle.c +++ b/baseboard/zork/variant_trembyle.c @@ -11,6 +11,7 @@ #include "driver/retimer/tusb544.h" #include "driver/tcpm/nct38xx.h" #include "driver/usb_mux/amd_fp5.h" +#include "driver/usb_mux/ps8743.h" #include "fan.h" #include "fan_chip.h" #include "gpio.h" @@ -306,8 +307,8 @@ const struct usb_mux usbc1_tusb544 = { const struct usb_mux usbc1_ps8743 = { .usb_port = USBC_PORT_C1, .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = PS8743_I2C_ADDR_FLAGS, - .driver = &ps874x_usb_mux_driver, + .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, + .driver = &ps8743_usb_mux_driver, }; struct usb_mux usbc1_amd_fp5_usb_mux = { .usb_port = USBC_PORT_C1, |