diff options
| -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 | 5 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 4 |
7 files changed, 10 insertions, 9 deletions
diff --git a/board/bobba/board.h b/board/bobba/board.h index 032232a898..b62b6fda63 100644 --- a/board/bobba/board.h +++ b/board/bobba/board.h @@ -80,7 +80,7 @@ #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 +#define CONFIG_USBC_PPC_SYV682X_NO_CC #ifndef __ASSEMBLER__ diff --git a/board/dood/board.h b/board/dood/board.h index 045862934c..530e2a0bf2 100644 --- a/board/dood/board.h +++ b/board/dood/board.h @@ -57,7 +57,7 @@ #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 +#define CONFIG_USBC_PPC_SYV682X_NO_CC #ifndef __ASSEMBLER__ diff --git a/board/fleex/board.h b/board/fleex/board.h index aa34f3e41e..cd04f31687 100644 --- a/board/fleex/board.h +++ b/board/fleex/board.h @@ -70,7 +70,7 @@ #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 +#define CONFIG_USBC_PPC_SYV682X_NO_CC #ifndef __ASSEMBLER__ diff --git a/board/meep/board.h b/board/meep/board.h index e67a310a29..362696722a 100644 --- a/board/meep/board.h +++ b/board/meep/board.h @@ -56,7 +56,7 @@ #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 +#define CONFIG_USBC_PPC_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 b369997390..33a84373f6 100644 --- a/board/phaser/board.h +++ b/board/phaser/board.h @@ -48,7 +48,7 @@ #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 +#define CONFIG_USBC_PPC_SYV682X_NO_CC #ifndef __ASSEMBLER__ diff --git a/include/config.h b/include/config.h index 9356e307c0..6388c27eed 100644 --- a/include/config.h +++ b/include/config.h @@ -4667,7 +4667,7 @@ #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 +#undef CONFIG_USBC_PPC_SYV682X_NO_CC /* Define to enable SYV682X VBUS smart discharge. */ #undef CONFIG_USBC_PPC_SYV682X_SMART_DISCHARGE @@ -5628,7 +5628,8 @@ #if defined(CONFIG_USBC_PPC_SYV682X) #define CONFIG_USBC_PPC_POLARITY #define CONFIG_USBC_PPC_VCONN -#if !defined(CONFIG_USB_PD_TCPM_ITE_ON_CHIP) && !defined(CONFIG_SYV682X_NO_CC) +#if !defined(CONFIG_USB_PD_TCPM_ITE_ON_CHIP) && \ + !defined(CONFIG_USBC_PPC_SYV682X_NO_CC) #undef CONFIG_USB_PD_TCPC_VCONN #endif #endif diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 5a7419599d..acd8780765 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -969,9 +969,9 @@ #define CONFIG_USBC_PPC_SYV682C #endif -#undef CONFIG_SYV682X_NO_CC +#undef CONFIG_USBC_PPC_SYV682X_NO_CC #ifdef CONFIG_PLATFORM_EC_USBC_PPC_SYV682X_NO_CC -#define CONFIG_SYV682X_NO_CC +#define CONFIG_USBC_PPC_SYV682X_NO_CC #endif #undef CONFIG_USB_PD_TCPC_RUNTIME_CONFIG |