From c51e0b2f75a208c74fd62ec4b22e2fe64e45f967 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 1 Feb 2017 11:00:50 -0800 Subject: [PATCH] PD: Remove CONFIG_USB_PD_TCPC_FW_VERSION This removes CONFIG_USB_PD_TCPC_FW_VERSION. board_print_tcpc_fw_version is removed since it's no longer called. PD chip info is printed in usb_pd_protocol.c. BUG=none BRANCH=none TEST=buildall. Boot Electro, verify chip info is printed. Change-Id: I2ff860c2a1b17ceea124644ba8feb356b9cca2eb Signed-off-by: Daisuke Nojiri Reviewed-on: https://chromium-review.googlesource.com/434911 Reviewed-by: Vincent Palatin --- board/eve/board.c | 10 ---------- board/eve/board.h | 1 - board/poppy/board.c | 16 ---------------- board/poppy/board.h | 1 - board/pyro/board.c | 16 ---------------- board/pyro/board.h | 1 - board/reef/board.c | 16 ---------------- board/reef/board.h | 1 - board/snappy/board.c | 16 ---------------- board/snappy/board.h | 1 - include/config.h | 3 --- 11 files changed, 82 deletions(-) diff --git a/board/eve/board.c b/board/eve/board.c index c831facb11..ec68d094cb 100644 --- a/board/eve/board.c +++ b/board/eve/board.c @@ -191,16 +191,6 @@ void board_set_tcpc_power_mode(int port, int mode) } } -#ifdef CONFIG_USB_PD_TCPC_FW_VERSION -void board_print_tcpc_fw_version(int port) -{ - int version; - - if (!anx74xx_tcpc_get_fw_version(port, &version)) - CPRINTS("TCPC p%d FW VER: 0x%x", port, version); -} -#endif - void board_reset_pd_mcu(void) { /* Assert reset */ diff --git a/board/eve/board.h b/board/eve/board.h index af5075cceb..0a655b91ea 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -149,7 +149,6 @@ #define CONFIG_USB_PD_PORT_COUNT 2 #define CONFIG_USB_PD_QUIRK_SLOW_CC_STATUS #define CONFIG_USB_PD_VBUS_DETECT_CHARGER -#define CONFIG_USB_PD_TCPC_FW_VERSION #define CONFIG_USB_PD_TCPM_MUX #define CONFIG_USB_PD_TCPM_ANX74XX #define CONFIG_USB_PD_TCPM_TCPCI diff --git a/board/poppy/board.c b/board/poppy/board.c index 25c9f0f994..d17566415a 100644 --- a/board/poppy/board.c +++ b/board/poppy/board.c @@ -244,22 +244,6 @@ void board_set_tcpc_power_mode(int port, int mode) } } -#ifdef CONFIG_USB_PD_TCPC_FW_VERSION -void board_print_tcpc_fw_version(int port) -{ - int rv; - int version; - - if (port) - rv = ps8751_tcpc_get_fw_version(port, &version); - else - rv = anx74xx_tcpc_get_fw_version(port, &version); - - if (!rv) - CPRINTS("TCPC p%d FW VER: 0x%x", port, version); -} -#endif - void board_reset_pd_mcu(void) { /* Assert reset */ diff --git a/board/poppy/board.h b/board/poppy/board.h index 2c7163a6b8..8a5b82d35e 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -124,7 +124,6 @@ #define CONFIG_USB_PD_PORT_COUNT 2 #define CONFIG_USB_PD_QUIRK_SLOW_CC_STATUS #define CONFIG_USB_PD_VBUS_DETECT_GPIO -#define CONFIG_USB_PD_TCPC_FW_VERSION #define CONFIG_USB_PD_TCPM_MUX #define CONFIG_USB_PD_TCPM_ANX74XX #define CONFIG_USB_PD_TCPM_TCPCI diff --git a/board/pyro/board.c b/board/pyro/board.c index f6e275032e..44d8e09bea 100644 --- a/board/pyro/board.c +++ b/board/pyro/board.c @@ -301,22 +301,6 @@ void board_reset_pd_mcu(void) board_set_tcpc_power_mode(0, 1); } -#ifdef CONFIG_USB_PD_TCPC_FW_VERSION -void board_print_tcpc_fw_version(int port) -{ - int rv; - int version; - - if (port) - rv = ps8751_tcpc_get_fw_version(port, &version); - else - rv = anx74xx_tcpc_get_fw_version(port, &version); - - if (!rv) - CPRINTS("TCPC p%d FW VER: 0x%x", port, version); -} -#endif - void board_tcpc_init(void) { int port, reg; diff --git a/board/pyro/board.h b/board/pyro/board.h index ca30fe90cd..01f8536fb5 100644 --- a/board/pyro/board.h +++ b/board/pyro/board.h @@ -102,7 +102,6 @@ #define CONFIG_USB_PD_QUIRK_SLOW_CC_STATUS #define CONFIG_USB_PD_VBUS_DETECT_CHARGER #define CONFIG_USB_PD_TCPC_LOW_POWER -#define CONFIG_USB_PD_TCPC_FW_VERSION #define CONFIG_USB_PD_TCPM_MUX /* for both PS8751 and ANX3429 */ #define CONFIG_USB_PD_TCPM_ANX74XX #define CONFIG_USB_PD_TCPM_PS8751 diff --git a/board/reef/board.c b/board/reef/board.c index 6832b5abab..7074ab4952 100644 --- a/board/reef/board.c +++ b/board/reef/board.c @@ -311,22 +311,6 @@ void board_reset_pd_mcu(void) board_set_tcpc_power_mode(0, 1); } -#ifdef CONFIG_USB_PD_TCPC_FW_VERSION -void board_print_tcpc_fw_version(int port) -{ - int rv; - int version; - - if (port) - rv = ps8751_tcpc_get_fw_version(port, &version); - else - rv = anx74xx_tcpc_get_fw_version(port, &version); - - if (!rv) - CPRINTS("TCPC p%d FW VER: 0x%x", port, version); -} -#endif - void board_tcpc_init(void) { int port, reg; diff --git a/board/reef/board.h b/board/reef/board.h index 73edab0dc7..0dd246b429 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -92,7 +92,6 @@ #define CONFIG_USB_PD_QUIRK_SLOW_CC_STATUS #define CONFIG_USB_PD_VBUS_DETECT_CHARGER #define CONFIG_USB_PD_TCPC_LOW_POWER -#define CONFIG_USB_PD_TCPC_FW_VERSION #define CONFIG_USB_PD_TCPM_MUX /* for both PS8751 and ANX3429 */ #define CONFIG_USB_PD_TCPM_ANX74XX #define CONFIG_USB_PD_TCPM_PS8751 diff --git a/board/snappy/board.c b/board/snappy/board.c index 2175b5e47b..1a40b5a49a 100644 --- a/board/snappy/board.c +++ b/board/snappy/board.c @@ -313,22 +313,6 @@ void board_reset_pd_mcu(void) board_set_tcpc_power_mode(0, 1); } -#ifdef CONFIG_USB_PD_TCPC_FW_VERSION -void board_print_tcpc_fw_version(int port) -{ - int rv; - int version; - - if (port) - rv = ps8751_tcpc_get_fw_version(port, &version); - else - rv = anx74xx_tcpc_get_fw_version(port, &version); - - if (!rv) - CPRINTS("TCPC p%d FW VER: 0x%x", port, version); -} -#endif - void board_tcpc_init(void) { int port, reg; diff --git a/board/snappy/board.h b/board/snappy/board.h index ed1e60d5ba..cf7587fc5f 100644 --- a/board/snappy/board.h +++ b/board/snappy/board.h @@ -96,7 +96,6 @@ #define CONFIG_USB_PD_QUIRK_SLOW_CC_STATUS #define CONFIG_USB_PD_VBUS_DETECT_CHARGER #define CONFIG_USB_PD_TCPC_LOW_POWER -#define CONFIG_USB_PD_TCPC_FW_VERSION #define CONFIG_USB_PD_TCPM_MUX /* for both PS8751 and ANX3429 */ #define CONFIG_USB_PD_TCPM_ANX74XX #define CONFIG_USB_PD_TCPM_PS8751 diff --git a/include/config.h b/include/config.h index 1e238bf3f9..69cd34815e 100644 --- a/include/config.h +++ b/include/config.h @@ -2209,9 +2209,6 @@ /* Use TCPC module (type-C port controller) */ #undef CONFIG_USB_PD_TCPC -/* Get TCPC firmware version */ -#undef CONFIG_USB_PD_TCPC_FW_VERSION - /* Enable TCPC to enter low power mode */ #undef CONFIG_USB_PD_TCPC_LOW_POWER