diff options
| -rw-r--r-- | baseboard/intelrvp/adlrvp.c | 4 | ||||
| -rw-r--r-- | board/brya/usbc_config.c | 4 | ||||
| -rw-r--r-- | board/gimble/usbc_config.c | 4 | ||||
| -rw-r--r-- | board/primus/usbc_config.c | 4 | ||||
| -rw-r--r-- | board/tglrvpu_ite/board.c | 4 | ||||
| -rw-r--r-- | driver/retimer/bb_retimer.c | 11 | ||||
| -rw-r--r-- | include/driver/retimer/bb_retimer_public.h | 10 |
7 files changed, 20 insertions, 21 deletions
diff --git a/baseboard/intelrvp/adlrvp.c b/baseboard/intelrvp/adlrvp.c index d992154c49..f0f2cb92ad 100644 --- a/baseboard/intelrvp/adlrvp.c +++ b/baseboard/intelrvp/adlrvp.c @@ -247,10 +247,10 @@ void board_overcurrent_event(int port, int is_overcurrented) ioex_set_level(oc_signal, is_overcurrented ? 0 : 1); } -__override int bb_retimer_power_handle(const struct usb_mux *me, int on_off) +__override int bb_retimer_power_enable(const struct usb_mux *me, bool enable) { /* Handle retimer's power domain.*/ - if (on_off) { + if (enable) { ioex_set_level(bb_controls[me->usb_port].usb_ls_en_gpio, 1); /* diff --git a/board/brya/usbc_config.c b/board/brya/usbc_config.c index d24143c40b..ddad81f7da 100644 --- a/board/brya/usbc_config.c +++ b/board/brya/usbc_config.c @@ -187,7 +187,7 @@ void config_usb_db_type(void) CPRINTS("Configured USB DB type number is %d", db_type); } -__override int bb_retimer_power_handle(const struct usb_mux *me, int on_off) +__override int bb_retimer_power_enable(const struct usb_mux *me, bool enable) { enum ioex_signal rst_signal; @@ -207,7 +207,7 @@ __override int bb_retimer_power_handle(const struct usb_mux *me, int on_off) * so we only need to sequence reset. */ - if (on_off) { + if (enable) { /* * Tpw, minimum time from VCC to RESET_N de-assertion is 100us. * For boards that don't provide a load switch control, the diff --git a/board/gimble/usbc_config.c b/board/gimble/usbc_config.c index f6aa7af363..5efd7e1cac 100644 --- a/board/gimble/usbc_config.c +++ b/board/gimble/usbc_config.c @@ -187,7 +187,7 @@ void config_usb_db_type(void) CPRINTS("Configured USB DB type number is %d", db_type); } -__override int bb_retimer_power_handle(const struct usb_mux *me, int on_off) +__override int bb_retimer_power_enable(const struct usb_mux *me, bool enable) { enum ioex_signal rst_signal; @@ -207,7 +207,7 @@ __override int bb_retimer_power_handle(const struct usb_mux *me, int on_off) * so we only need to sequence reset. */ - if (on_off) { + if (enable) { /* * Tpw, minimum time from VCC to RESET_N de-assertion is 100us. * For boards that don't provide a load switch control, the diff --git a/board/primus/usbc_config.c b/board/primus/usbc_config.c index f6770c8f27..190d5fb82b 100644 --- a/board/primus/usbc_config.c +++ b/board/primus/usbc_config.c @@ -187,7 +187,7 @@ void config_usb_db_type(void) CPRINTS("Configured USB DB type number is %d", db_type); } -__override int bb_retimer_power_handle(const struct usb_mux *me, int on_off) +__override int bb_retimer_power_enable(const struct usb_mux *me, bool enable) { enum ioex_signal rst_signal; @@ -207,7 +207,7 @@ __override int bb_retimer_power_handle(const struct usb_mux *me, int on_off) * so we only need to sequence reset. */ - if (on_off) { + if (enable) { /* * Tpw, minimum time from VCC to RESET_N de-assertion is 100us. * For boards that don't provide a load switch control, the diff --git a/board/tglrvpu_ite/board.c b/board/tglrvpu_ite/board.c index ba5ca0282d..c81e66b78f 100644 --- a/board/tglrvpu_ite/board.c +++ b/board/tglrvpu_ite/board.c @@ -223,7 +223,7 @@ int board_get_version(void) return board_id | (fab_id << 8); } -__override int bb_retimer_power_handle(const struct usb_mux *me, int on_off) +__override int bb_retimer_power_enable(const struct usb_mux *me, bool enable) { const struct bb_usb_control *control = &bb_controls[me->usb_port]; @@ -235,7 +235,7 @@ __override int bb_retimer_power_handle(const struct usb_mux *me, int on_off) GPIO_USB_C1_RETIMER_FORCE_PWR : GPIO_USB_C0_RETIMER_FORCE_PWR; /* handle retimer's power domain */ - if (on_off) { + if (enable) { /* * BB retimer NVM can be shared between multiple ports, hence * lock enabling the retimer until the current retimer request diff --git a/driver/retimer/bb_retimer.c b/driver/retimer/bb_retimer.c index 2f98b4b185..94162a43fa 100644 --- a/driver/retimer/bb_retimer.c +++ b/driver/retimer/bb_retimer.c @@ -123,13 +123,13 @@ static int bb_retimer_write(const struct usb_mux *me, return rv; } -__overridable int bb_retimer_power_handle(const struct usb_mux *me, int on_off) +__overridable int bb_retimer_power_enable(const struct usb_mux *me, bool enable) { const struct bb_usb_control *control = &bb_controls[me->usb_port]; /* handle retimer's power domain */ - if (on_off) { + if (enable) { gpio_set_level(control->usb_ls_en_gpio, 1); /* * Tpw, minimum time from VCC to RESET_N de-assertion is 100us. @@ -470,8 +470,7 @@ static int retimer_set_state(const struct usb_mux *me, mux_state_t mux_state) static int retimer_low_power_mode(const struct usb_mux *me) { - bb_retimer_power_handle(me, 0); - return EC_SUCCESS; + return bb_retimer_power_enable(me, false); } static bool is_retimer_fw_update_capable(void) @@ -487,11 +486,11 @@ static int retimer_init(const struct usb_mux *me) /* Burnside Bridge is powered by main AP rail */ if (chipset_in_or_transitioning_to_state(CHIPSET_STATE_ANY_OFF)) { /* Ensure reset is asserted while chip is not powered */ - bb_retimer_power_handle(me, 0); + bb_retimer_power_enable(me, false); return EC_ERROR_NOT_POWERED; } - rv = bb_retimer_power_handle(me, 1); + rv = bb_retimer_power_enable(me, true); if (rv != EC_SUCCESS) return rv; diff --git a/include/driver/retimer/bb_retimer_public.h b/include/driver/retimer/bb_retimer_public.h index 7d9832f4ea..78047d3f7c 100644 --- a/include/driver/retimer/bb_retimer_public.h +++ b/include/driver/retimer/bb_retimer_public.h @@ -28,17 +28,17 @@ extern struct bb_usb_control bb_controls[]; #endif /** - * Handle the power state of BB retimer + * Enable/disable the power state of BB retimer * * Define override function at board level if the platform specific changes - * are needed to handle the power state of BB retimer. + * are needed to enable/disable the power state of BB retimer. * * @param me Pointer to USB mux - * @param on_off BB retimer state to be changed + * @param enable BB retimer power state to be changed * * @return EC_SUCCESS, or non-zero on error. */ -__override_proto int bb_retimer_power_handle(const struct usb_mux *me, - int on_off); +__override_proto int bb_retimer_power_enable(const struct usb_mux *me, + bool enable); #endif /* __CROS_EC_DRIVER_RETIMER_BB_RETIMER_PUBLIC_H */ |