diff options
author | Denis Brockus <dbrockus@chromium.org> | 2019-08-09 10:59:03 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-08-13 00:47:54 +0000 |
commit | bb7c26f3d4172e715e277f9b0f03c45e3131e917 (patch) | |
tree | 18a8d605268ae43a4bb4cd2aeed2d2417cd76dd8 | |
parent | 4609b59404bd6e32c4cdb267658511a46557dab2 (diff) | |
download | chrome-ec-bb7c26f3d4172e715e277f9b0f03c45e3131e917.tar.gz |
Trembyle: Change port 1 PPC to NX20P3483
BUG=b:138599218
BRANCH=none
TEST=make buildall -j
Change-Id: If68259e289a2b3e052028ff0b2ffd59076eaf970
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1745569
Commit-Queue: Edward Hill <ecgh@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
-rw-r--r-- | baseboard/zork/baseboard.c | 7 | ||||
-rw-r--r-- | baseboard/zork/baseboard.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index 49582742f8..c18a38fc39 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -19,6 +19,7 @@ #include "driver/accel_kx022.h" #include "driver/accelgyro_bmi160.h" #include "driver/bc12/pi3usb9201.h" +#include "driver/ppc/nx20p348x.h" #include "driver/ppc/sn5s330.h" #include "driver/tcpm/ps8xxx.h" #include "driver/tcpm/nct38xx.h" @@ -218,8 +219,8 @@ struct ppc_config_t ppc_chips[] = { [USBC_PORT_C1] = { .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = SN5S330_ADDR0_FLAGS, - .drv = &sn5s330_drv + .i2c_addr_flags = NX20P3483_ADDR1_FLAGS, + .drv = &nx20p348x_drv }, }; BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); @@ -233,7 +234,7 @@ void ppc_interrupt(enum gpio_signal signal) break; case GPIO_USB_C1_PPC_INT_ODL: - sn5s330_interrupt(USBC_PORT_C1); + nx20p348x_interrupt(USBC_PORT_C1); break; default: diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index ea990eab5d..672369f008 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -135,12 +135,12 @@ #define CONFIG_USB_PD_TCPM_PS8751 #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TRY_SRC -#define CONFIG_USB_PD_VBUS_DETECT_PPC +#define CONFIG_USB_PD_VBUS_DETECT_TCPC #define CONFIG_USBC_PPC #define CONFIG_USBC_PPC_DEDICATED_INT #define CONFIG_USBC_PPC_SBU +#define CONFIG_USBC_PPC_NX20P3483 #define CONFIG_USBC_PPC_SN5S330 -#define CONFIG_USBC_PPC_VCONN #define CONFIG_USBC_SS_MUX #define CONFIG_USBC_SS_MUX_DFP_ONLY #define CONFIG_USBC_VCONN |