diff options
| -rw-r--r-- | board/coral/board.h | 2 | ||||
| -rw-r--r-- | board/eve/board.h | 2 | ||||
| -rw-r--r-- | board/grunt/board.h | 2 | ||||
| -rw-r--r-- | board/poppy/board.h | 2 | ||||
| -rw-r--r-- | board/reef/board.h | 2 | ||||
| -rw-r--r-- | board/yorp/board.h | 3 | ||||
| -rw-r--r-- | driver/build.mk | 4 | ||||
| -rw-r--r-- | driver/tcpm/tcpci.c | 4 | ||||
| -rw-r--r-- | include/config.h | 4 |
9 files changed, 16 insertions, 9 deletions
diff --git a/board/coral/board.h b/board/coral/board.h index 45815bc4ac..2eeacbad11 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -91,7 +91,7 @@ #define CONFIG_USB_PD_VBUS_DETECT_CHARGER #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_TCPM_MUX /* for both PS8751 and ANX3429 */ -#define CONFIG_USB_PD_TCPM_ANX74XX +#define CONFIG_USB_PD_TCPM_ANX3429 #define CONFIG_USB_PD_TCPM_PS8751 #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TRY_SRC diff --git a/board/eve/board.h b/board/eve/board.h index faa3ee3c1b..44af362d22 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -164,7 +164,7 @@ #define CONFIG_USB_PD_VBUS_DETECT_CHARGER #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_TCPM_MUX -#define CONFIG_USB_PD_TCPM_ANX74XX +#define CONFIG_USB_PD_TCPM_ANX3429 #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TRY_SRC #undef CONFIG_USB_PD_TRY_SRC_MIN_BATT_SOC diff --git a/board/grunt/board.h b/board/grunt/board.h index c14b0e5cec..046722ddf2 100644 --- a/board/grunt/board.h +++ b/board/grunt/board.h @@ -87,7 +87,7 @@ #define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 #define CONFIG_USB_PD_PORT_COUNT 2 #define CONFIG_USB_PD_TCPC_LOW_POWER -#define CONFIG_USB_PD_TCPM_ANX74XX +#define CONFIG_USB_PD_TCPM_ANX3429 #define CONFIG_USB_PD_TCPM_MUX #define CONFIG_USB_PD_TCPM_PS8751 #define CONFIG_USB_PD_TCPM_TCPCI diff --git a/board/poppy/board.h b/board/poppy/board.h index ed5b94617a..950728a7ac 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -153,7 +153,7 @@ #define CONFIG_USB_PD_VBUS_DETECT_GPIO #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_TCPM_MUX -#define CONFIG_USB_PD_TCPM_ANX74XX +#define CONFIG_USB_PD_TCPM_ANX3429 #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TCPM_PS8751 #define CONFIG_USB_PD_TRY_SRC diff --git a/board/reef/board.h b/board/reef/board.h index 4693e17195..e4daa2491f 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -89,7 +89,7 @@ #define CONFIG_USB_PD_VBUS_DETECT_CHARGER #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_TCPM_MUX /* for both PS8751 and ANX3429 */ -#define CONFIG_USB_PD_TCPM_ANX74XX +#define CONFIG_USB_PD_TCPM_ANX3429 #define CONFIG_USB_PD_TCPM_PS8751 #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TRY_SRC diff --git a/board/yorp/board.h b/board/yorp/board.h index 9d35e79e6c..3993a25d32 100644 --- a/board/yorp/board.h +++ b/board/yorp/board.h @@ -64,7 +64,8 @@ #define CONFIG_USB_PD_COMM_LOCKED #define CONFIG_USB_PD_DISCHARGE_PPC #define CONFIG_USB_PD_TCPC_LOW_POWER -#define CONFIG_USB_PD_TCPM_ANX74XX /* C0 TCPC: ANX7447QN */ +/* TODO(b/74127309): Replace below config once cl:956790 lands */ +#define CONFIG_USB_PD_TCPM_ANX3429 /* C0 TCPC: ANX7447QN */ #define CONFIG_USB_PD_TCPM_PS8751 /* C1 TCPC: PS8751 */ #define CONFIG_USB_PD_TCPM_MUX #define CONFIG_USB_PD_TCPM_TCPCI diff --git a/driver/build.mk b/driver/build.mk index 924a76eecd..cc0a119640 100644 --- a/driver/build.mk +++ b/driver/build.mk @@ -99,7 +99,9 @@ driver-$(CONFIG_USB_PD_TCPM_STUB)+=tcpm/stub.o driver-$(CONFIG_USB_PD_TCPM_TCPCI)+=tcpm/tcpci.o driver-$(CONFIG_USB_PD_TCPM_FUSB302)+=tcpm/fusb302.o driver-$(CONFIG_USB_PD_TCPM_ITE83XX)+=tcpm/it83xx.o -driver-$(CONFIG_USB_PD_TCPM_ANX74XX)+=tcpm/anx74xx.o +driver-$(CONFIG_USB_PD_TCPM_ANX3429)+=tcpm/anx74xx.o +driver-$(CONFIG_USB_PD_TCPM_ANX740X)+=tcpm/anx74xx.o +driver-$(CONFIG_USB_PD_TCPM_ANX741X)+=tcpm/anx74xx.o driver-$(CONFIG_USB_PD_TCPM_ANX7688)+=tcpm/anx7688.o driver-$(CONFIG_USB_PD_TCPM_PS8751)+=tcpm/ps8xxx.o driver-$(CONFIG_USB_PD_TCPM_PS8805)+=tcpm/ps8xxx.o diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c index 11c7283124..e1c1efab28 100644 --- a/driver/tcpm/tcpci.c +++ b/driver/tcpm/tcpci.c @@ -380,7 +380,9 @@ int tcpci_get_chip_info(int port, int renew, i->device_id = val; switch (i->vendor_id) { -#ifdef CONFIG_USB_PD_TCPM_ANX74XX +#if defined(CONFIG_USB_PD_TCPM_ANX3429) || \ + defined(CONFIG_USB_PD_TCPM_ANX740X) || \ + defined(CONFIG_USB_PD_TCPM_ANX741X) case ANX74XX_VENDOR_ID: error = anx74xx_tcpc_get_fw_version(port, &val); break; diff --git a/include/config.h b/include/config.h index 62a8bb75b0..6b884a8948 100644 --- a/include/config.h +++ b/include/config.h @@ -2840,7 +2840,9 @@ #undef CONFIG_USB_PD_TCPM_TCPCI #undef CONFIG_USB_PD_TCPM_FUSB302 #undef CONFIG_USB_PD_TCPM_ITE83XX -#undef CONFIG_USB_PD_TCPM_ANX74XX +#undef CONFIG_USB_PD_TCPM_ANX3429 +#undef CONFIG_USB_PD_TCPM_ANX740X +#undef CONFIG_USB_PD_TCPM_ANX741X #undef CONFIG_USB_PD_TCPM_ANX7688 #undef CONFIG_USB_PD_TCPM_PS8751 #undef CONFIG_USB_PD_TCPM_PS8805 |