diff options
author | Edward Hill <ecgh@chromium.org> | 2018-08-27 20:03:58 -0600 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-09-17 13:17:34 -0700 |
commit | e3b4438f26ba24d3bb97345da8717225436bbe0a (patch) | |
tree | 8dba48a3c614e7abdfeae452cb6f6971c44ee98e | |
parent | b2e389668c7e027dd184c59f7319d4379f04a809 (diff) | |
download | chrome-ec-e3b4438f26ba24d3bb97345da8717225436bbe0a.tar.gz |
pd: Change tcpm_set_drp_toggle() to tcpm_enable_drp_toggle()
Change tcpm_set_drp_toggle() to tcpm_enable_drp_toggle(), since enable=0
was unused.
BRANCH=none
BUG=b:111663127
TEST=PD and TCPC low power still work on Grunt
Change-Id: I760a067b11984a579261deac856419d46400497b
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1194353
Reviewed-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
-rw-r--r-- | common/usb_pd_protocol.c | 2 | ||||
-rw-r--r-- | driver/tcpm/anx74xx.c | 11 | ||||
-rw-r--r-- | driver/tcpm/tcpci.c | 5 | ||||
-rw-r--r-- | driver/tcpm/tcpci.h | 2 | ||||
-rw-r--r-- | driver/tcpm/tcpm.h | 4 | ||||
-rw-r--r-- | include/usb_pd_tcpm.h | 3 |
6 files changed, 9 insertions, 18 deletions
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index 7a4f543858..b77087e6f0 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -3831,7 +3831,7 @@ void pd_task(void *u) pd_set_power_role(port, PD_ROLE_SOURCE); timeout = 2*MSEC; } else { - tcpm_set_drp_toggle(port, 1); + tcpm_enable_drp_toggle(port); pd[port].flags |= PD_FLAGS_LPM_REQUESTED; pd[port].flags |= PD_FLAGS_TCPC_DRP_TOGGLE; timeout = -1; diff --git a/driver/tcpm/anx74xx.c b/driver/tcpm/anx74xx.c index 9164b9a313..cdbf14b644 100644 --- a/driver/tcpm/anx74xx.c +++ b/driver/tcpm/anx74xx.c @@ -729,15 +729,10 @@ static void anx74xx_handle_power_mode(int port, int mode) } } -static int anx74xx_tcpc_drp_toggle(int port, int enable) +static int anx74xx_tcpc_drp_toggle(int port) { - /* - * When using low power mode, this function is an entry to point to - * bring the ANX3429 in to or out of standby mode. DRP toggle is - * associated with the chip being in standby mode. - */ - anx74xx_handle_power_mode(port, enable ? ANX74XX_STANDBY_MODE : - ANX74XX_NORMAL_MODE); + /* DRP auto-toggle happens when the ANX3429 is in standby mode. */ + anx74xx_handle_power_mode(port, ANX74XX_STANDBY_MODE); return EC_SUCCESS; } diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c index 250673b44a..84e22bda06 100644 --- a/driver/tcpm/tcpci.c +++ b/driver/tcpm/tcpci.c @@ -253,13 +253,10 @@ int tcpci_tcpm_set_cc(int port, int pull) } #ifdef CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE -int tcpci_tcpc_drp_toggle(int port, int enable) +int tcpci_tcpc_drp_toggle(int port) { int rv; - if (!enable) - return EC_SUCCESS; - /* Set auto drp toggle */ rv = set_role_ctrl(port, 1, TYPEC_RP_USB, TYPEC_CC_RD); diff --git a/driver/tcpm/tcpci.h b/driver/tcpm/tcpci.h index 3b58657f1f..24c5d9c2f6 100644 --- a/driver/tcpm/tcpci.h +++ b/driver/tcpm/tcpci.h @@ -142,7 +142,7 @@ int tcpci_tcpm_transmit(int port, enum tcpm_transmit_type type, uint16_t header, const uint32_t *data); int tcpci_tcpm_release(int port); #ifdef CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE -int tcpci_tcpc_drp_toggle(int port, int enable); +int tcpci_tcpc_drp_toggle(int port); #endif #ifdef CONFIG_USB_PD_TCPC_LOW_POWER int tcpci_enter_low_power_mode(int port); diff --git a/driver/tcpm/tcpm.h b/driver/tcpm/tcpm.h index a25ef6508b..02cdbe2cb6 100644 --- a/driver/tcpm/tcpm.h +++ b/driver/tcpm/tcpm.h @@ -206,9 +206,9 @@ static inline int tcpm_auto_toggle_supported(int port) return !!tcpc_config[port].drv->drp_toggle; } -static inline int tcpm_set_drp_toggle(int port, int enable) +static inline int tcpm_enable_drp_toggle(int port) { - return tcpc_config[port].drv->drp_toggle(port, enable); + return tcpc_config[port].drv->drp_toggle(port); } #endif diff --git a/include/usb_pd_tcpm.h b/include/usb_pd_tcpm.h index 1c600c8d7e..2d12b31ceb 100644 --- a/include/usb_pd_tcpm.h +++ b/include/usb_pd_tcpm.h @@ -202,11 +202,10 @@ struct tcpm_drv { * Enable TCPC auto DRP toggling. * * @param port Type-C port number - * @param enable 1: Enable 0: Disable * * @return EC_SUCCESS or error */ - int (*drp_toggle)(int port, int enable); + int (*drp_toggle)(int port); #endif /** |