diff options
| author | Vijay Hiremath <vijay.p.hiremath@intel.com> | 2020-01-23 07:19:06 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-28 02:35:08 +0000 |
| commit | 50d60e3fe12a852ae412d9502ca22a5b72cb441b (patch) | |
| tree | 3d5f925aba3d00f523812acb5238548a6e3dc4a1 /board/samus_pd | |
| parent | 43dfea03a49d46677590ac42f2fce4419835e1e7 (diff) | |
| download | chrome-ec-50d60e3fe12a852ae412d9502ca22a5b72cb441b.tar.gz | |
usb_mux: cleanup: Replace mux state enums with ec_command bit flag
BUG=b:145796172
BRANCH=none
TEST=make buildall -j
Change-Id: Ie4ffaf208745764262931501f0dff77b525a4e59
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2017569
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'board/samus_pd')
| -rw-r--r-- | board/samus_pd/usb_mux.c | 14 | ||||
| -rw-r--r-- | board/samus_pd/usb_pd_config.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/board/samus_pd/usb_mux.c b/board/samus_pd/usb_mux.c index 2c3a0b3a45..732de79968 100644 --- a/board/samus_pd/usb_mux.c +++ b/board/samus_pd/usb_mux.c @@ -48,7 +48,7 @@ static int board_init_usb_mux(int port) static int board_set_usb_mux(int port, mux_state_t mux_state) { const struct usb_port_mux *usb_mux = mux_gpios + port; - int polarity = mux_state & MUX_POLARITY_INVERTED; + int polarity = mux_state & USB_PD_MUX_POLARITY_INVERTED; /* reset everything */ gpio_set_level(usb_mux->ss1_en_l, 1); @@ -58,16 +58,16 @@ static int board_set_usb_mux(int port, mux_state_t mux_state) gpio_set_level(usb_mux->ss1_dp_mode, 1); gpio_set_level(usb_mux->ss2_dp_mode, 1); - if (!(mux_state & (MUX_USB_ENABLED | MUX_DP_ENABLED))) + if (!(mux_state & (USB_PD_MUX_USB_ENABLED | USB_PD_MUX_DP_ENABLED))) /* everything is already disabled, we can return */ return EC_SUCCESS; - if (mux_state & MUX_USB_ENABLED) + if (mux_state & USB_PD_MUX_USB_ENABLED) /* USB 3.0 uses 2 superspeed lanes */ gpio_set_level(polarity ? usb_mux->ss2_dp_mode : usb_mux->ss1_dp_mode, 0); - if (mux_state & MUX_DP_ENABLED) { + if (mux_state & USB_PD_MUX_DP_ENABLED) { /* DP uses available superspeed lanes (x2 or x4) */ gpio_set_level(usb_mux->dp_polarity, polarity); gpio_set_level(usb_mux->dp_mode_l, 0); @@ -88,13 +88,13 @@ static int board_get_usb_mux(int port, mux_state_t *mux_state) if (!gpio_get_level(usb_mux->ss1_dp_mode) || !gpio_get_level(usb_mux->ss2_dp_mode)) - *mux_state |= MUX_USB_ENABLED; + *mux_state |= USB_PD_MUX_USB_ENABLED; if (!gpio_get_level(usb_mux->dp_mode_l)) - *mux_state |= MUX_DP_ENABLED; + *mux_state |= USB_PD_MUX_DP_ENABLED; if (gpio_get_level(usb_mux->dp_polarity)) - *mux_state |= MUX_POLARITY_INVERTED; + *mux_state |= USB_PD_MUX_POLARITY_INVERTED; return EC_SUCCESS; } diff --git a/board/samus_pd/usb_pd_config.h b/board/samus_pd/usb_pd_config.h index 8b01e30b64..c81b0bf113 100644 --- a/board/samus_pd/usb_pd_config.h +++ b/board/samus_pd/usb_pd_config.h @@ -243,7 +243,7 @@ static inline void pd_config_init(int port, uint8_t power_role) pd_tx_init(); /* Reset mux ... for NONE polarity doesn't matter */ - usb_mux_set(port, TYPEC_MUX_NONE, USB_SWITCH_DISCONNECT, 0); + usb_mux_set(port, USB_PD_MUX_NONE, USB_SWITCH_DISCONNECT, 0); if (port == 0) { gpio_set_level(GPIO_USB_C0_CC1_VCONN1_EN_L, 1); |