diff options
| author | Eric Herrmann <eherrmann@chromium.org> | 2021-02-25 20:44:57 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-03 19:29:53 +0000 |
| commit | 801ac5a0df178a58d20d78cddb69042b7feae016 (patch) | |
| tree | f3bb7089811e5d13ec44a04656784b017eb6dc9b | |
| parent | 698193fa224863758f2fa74828b10773b295b38c (diff) | |
| download | chrome-ec-801ac5a0df178a58d20d78cddb69042b7feae016.tar.gz | |
Octopus: Re-enable VCONN sourcing from TCPC
The SYV682 shouldn't have VCONN supplied to its host side CC pins, but
on Octopus these pins aren't used and the TCPC must provide VCONN.
Since this is a non-standard configuration, make an exception for these
Octopus boards by defining a new SYV682 flag to indicate that it does
not pass through CC.
BUG=b:180973460
TEST=make buildall
BRANCH=None
Signed-off-by: Eric Herrmann <eherrmann@chromium.org>
Change-Id: I043b6025abbeeaaf9e261d2721da3aed5483e177
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2721234
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Marco Chen <marcochen@chromium.org>
| -rw-r--r-- | board/bobba/board.h | 2 | ||||
| -rw-r--r-- | board/dood/board.h | 2 | ||||
| -rw-r--r-- | board/fleex/board.h | 2 | ||||
| -rw-r--r-- | board/meep/board.h | 2 | ||||
| -rw-r--r-- | board/phaser/board.h | 2 | ||||
| -rw-r--r-- | include/config.h | 6 |
6 files changed, 15 insertions, 1 deletions
diff --git a/board/bobba/board.h b/board/bobba/board.h index 238c446f30..4cb9fc3427 100644 --- a/board/bobba/board.h +++ b/board/bobba/board.h @@ -78,6 +78,8 @@ #define CONFIG_USBC_PPC_DEDICATED_INT #undef CONFIG_SYV682X_HV_ILIM #define CONFIG_SYV682X_HV_ILIM SYV682X_HV_ILIM_5_50 +/* SYV682 isn't connected to CC, so TCPC must provide VCONN */ +#define CONFIG_SYV682X_NO_CC #ifndef __ASSEMBLER__ diff --git a/board/dood/board.h b/board/dood/board.h index 47e5b460da..045862934c 100644 --- a/board/dood/board.h +++ b/board/dood/board.h @@ -56,6 +56,8 @@ #define CONFIG_USBC_PPC_DEDICATED_INT #undef CONFIG_SYV682X_HV_ILIM #define CONFIG_SYV682X_HV_ILIM SYV682X_HV_ILIM_5_50 +/* SYV682 isn't connected to CC, so TCPC must provide VCONN */ +#define CONFIG_SYV682X_NO_CC #ifndef __ASSEMBLER__ diff --git a/board/fleex/board.h b/board/fleex/board.h index d225b5cc1a..aa34f3e41e 100644 --- a/board/fleex/board.h +++ b/board/fleex/board.h @@ -69,6 +69,8 @@ /* Additional PPC second source */ #define CONFIG_USBC_PPC_SYV682X #define CONFIG_USBC_PPC_DEDICATED_INT +/* SYV682 isn't connected to CC, so TCPC must provide VCONN */ +#define CONFIG_SYV682X_NO_CC #ifndef __ASSEMBLER__ diff --git a/board/meep/board.h b/board/meep/board.h index 3675eab0bf..175fe6c79c 100644 --- a/board/meep/board.h +++ b/board/meep/board.h @@ -56,6 +56,8 @@ #define CONFIG_USBC_PPC_DEDICATED_INT #undef CONFIG_SYV682X_HV_ILIM #define CONFIG_SYV682X_HV_ILIM SYV682X_HV_ILIM_5_50 +/* SYV682 isn't connected to CC, so TCPC must provide VCONN */ +#define CONFIG_SYV682X_NO_CC /* Additional TCPC second source in Port 1 */ #define CONFIG_USB_PD_TCPM_MULTI_PS8XXX diff --git a/board/phaser/board.h b/board/phaser/board.h index e230c98efc..e4ca3c648c 100644 --- a/board/phaser/board.h +++ b/board/phaser/board.h @@ -48,6 +48,8 @@ #define CONFIG_USBC_PPC_DEDICATED_INT #undef CONFIG_SYV682X_HV_ILIM #define CONFIG_SYV682X_HV_ILIM SYV682X_HV_ILIM_5_50 +/* SYV682 isn't connected to CC, so TCPC must provide VCONN */ +#define CONFIG_SYV682X_NO_CC #ifndef __ASSEMBLER__ diff --git a/include/config.h b/include/config.h index a1775b0ded..c79865e1f5 100644 --- a/include/config.h +++ b/include/config.h @@ -4516,6 +4516,9 @@ */ #define CONFIG_SYV682X_HV_ILIM SYV682X_HV_ILIM_3_30 +/* SYV682 does not pass through CC, instead it bypasses to the TCPC */ +#undef CONFIG_SYV682X_NO_CC + /* PPC is capable of gating the SBU lines. */ #undef CONFIG_USBC_PPC_SBU @@ -5432,7 +5435,8 @@ #define CONFIG_USBC_PPC_POLARITY #define CONFIG_USBC_PPC_VCONN #if !defined(CONFIG_USB_PD_TCPM_DRIVER_IT83XX) && \ - !defined(CONFIG_USB_PD_TCPM_DRIVER_IT8XXX2) + !defined(CONFIG_USB_PD_TCPM_DRIVER_IT8XXX2) && \ + !defined(CONFIG_SYV682X_NO_CC) #undef CONFIG_USB_PD_TCPC_VCONN #endif #endif |