diff options
author | Ivan Chen <yulunchen@google.com> | 2023-05-17 03:32:45 +0000 |
---|---|---|
committer | Ivan Chen <yulunchen@google.com> | 2023-05-17 03:32:45 +0000 |
commit | d7c9c6beb03ee5725232b9ac3bfe4825e1e227cb (patch) | |
tree | 3a0d6776c0e76e325d1b087cd51a850cb871358e /driver/retimer | |
parent | 8641442366bd7c2c133e302a57f904dfac3c896b (diff) | |
parent | b34dc2ae9022e2fbb57ae6477891ff32954c62fd (diff) | |
download | chrome-ec-firmware-brya-14505.B-main.tar.gz |
Merge remote-tracking branch cros/main into firmware-brya-14505.B-mainfirmware-brya-14505.B-main
Generated by: util/update_release_branch.py --board brya firmware-brya-14505.B-main
Relevant changes:
git log --oneline 8641442366..b34dc2ae90 -- board/brya board/brya
util/getversion.sh
BRANCH=None
TEST=`make -j buildall`
Force-Relevant-Builds: all
Change-Id: I63149b4c1782b3ed57f2556755901c21f5f1e3e9
Signed-off-by: Ivan Chen <yulunchen@google.com>
Diffstat (limited to 'driver/retimer')
-rw-r--r-- | driver/retimer/anx7483.c | 2 | ||||
-rw-r--r-- | driver/retimer/nb7v904m.c | 2 | ||||
-rw-r--r-- | driver/retimer/pi3dpx1207.c | 2 | ||||
-rw-r--r-- | driver/retimer/ps8802.c | 2 | ||||
-rw-r--r-- | driver/retimer/ps8818.c | 2 | ||||
-rw-r--r-- | driver/retimer/tusb544.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/driver/retimer/anx7483.c b/driver/retimer/anx7483.c index 4b07848b9e..b4532ee12c 100644 --- a/driver/retimer/anx7483.c +++ b/driver/retimer/anx7483.c @@ -232,7 +232,7 @@ test_export_static int anx7483_set(const struct usb_mux *me, *ack_required = false; /* This driver treats safe mode as none */ - if (mux_state == USB_PD_MUX_SAFE_MODE) + if (mux_state & USB_PD_MUX_SAFE_MODE) mux_state = USB_PD_MUX_NONE; /* diff --git a/driver/retimer/nb7v904m.c b/driver/retimer/nb7v904m.c index 2990a906b5..18fdf3b2ba 100644 --- a/driver/retimer/nb7v904m.c +++ b/driver/retimer/nb7v904m.c @@ -154,7 +154,7 @@ static int nb7v904m_set_mux(const struct usb_mux *me, mux_state_t mux_state, *ack_required = false; /* This driver treats safe mode as none */ - if (mux_state == USB_PD_MUX_SAFE_MODE) + if (mux_state & USB_PD_MUX_SAFE_MODE) mux_state = USB_PD_MUX_NONE; /* Turn off redriver if it's not needed at all. */ diff --git a/driver/retimer/pi3dpx1207.c b/driver/retimer/pi3dpx1207.c index e40f269e3b..4a4c180f8c 100644 --- a/driver/retimer/pi3dpx1207.c +++ b/driver/retimer/pi3dpx1207.c @@ -102,7 +102,7 @@ static int pi3dpx1207_set_mux(const struct usb_mux *me, mux_state_t mux_state, *ack_required = false; /* This driver treats safe mode as none */ - if (mux_state == USB_PD_MUX_SAFE_MODE) + if (mux_state & USB_PD_MUX_SAFE_MODE) mux_state = USB_PD_MUX_NONE; /* USB */ diff --git a/driver/retimer/ps8802.c b/driver/retimer/ps8802.c index e2d93a25b4..24ad0f290f 100644 --- a/driver/retimer/ps8802.c +++ b/driver/retimer/ps8802.c @@ -189,7 +189,7 @@ static int ps8802_set_mux(const struct usb_mux *me, mux_state_t mux_state, *ack_required = false; /* This driver treats safe mode as none */ - if (mux_state == USB_PD_MUX_SAFE_MODE) + if (mux_state & USB_PD_MUX_SAFE_MODE) mux_state = USB_PD_MUX_NONE; if (chipset_in_state(CHIPSET_STATE_HARD_OFF)) diff --git a/driver/retimer/ps8818.c b/driver/retimer/ps8818.c index dff1b33a64..1f17146476 100644 --- a/driver/retimer/ps8818.c +++ b/driver/retimer/ps8818.c @@ -90,7 +90,7 @@ static int ps8818_set_mux(const struct usb_mux *me, mux_state_t mux_state, *ack_required = false; /* This driver treats safe mode as none */ - if (mux_state == USB_PD_MUX_SAFE_MODE) + if (mux_state & USB_PD_MUX_SAFE_MODE) mux_state = USB_PD_MUX_NONE; if (chipset_in_state(CHIPSET_STATE_HARD_OFF)) diff --git a/driver/retimer/tusb544.c b/driver/retimer/tusb544.c index c2d617c3be..8bac6cedd6 100644 --- a/driver/retimer/tusb544.c +++ b/driver/retimer/tusb544.c @@ -61,7 +61,7 @@ static int tusb544_set_mux(const struct usb_mux *me, mux_state_t mux_state, *ack_required = false; /* This driver treats safe mode as none */ - if (mux_state == USB_PD_MUX_SAFE_MODE) + if (mux_state & USB_PD_MUX_SAFE_MODE) mux_state = USB_PD_MUX_NONE; if (mux_state == USB_PD_MUX_NONE) |