diff options
Diffstat (limited to 'driver/usb_mux/ps8740.c')
| -rw-r--r-- | driver/usb_mux/ps8740.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/driver/usb_mux/ps8740.c b/driver/usb_mux/ps8740.c index 618c74cd65..557c4f1976 100644 --- a/driver/usb_mux/ps8740.c +++ b/driver/usb_mux/ps8740.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -14,14 +14,12 @@ int ps8740_read(const struct usb_mux *me, uint8_t reg, int *val) { - return i2c_read8(me->i2c_port, me->i2c_addr_flags, - reg, val); + return i2c_read8(me->i2c_port, me->i2c_addr_flags, reg, val); } int ps8740_write(const struct usb_mux *me, uint8_t reg, uint8_t val) { - return i2c_write8(me->i2c_port, me->i2c_addr_flags, - reg, val); + return i2c_write8(me->i2c_port, me->i2c_addr_flags, reg, val); } static int ps8740_init(const struct usb_mux *me) @@ -42,7 +40,7 @@ static int ps8740_init(const struct usb_mux *me) if (res) return res; - res = ps8740_read(me, PS8740_REG_CHIP_ID2, &id2); + res = ps8740_read(me, PS8740_REG_CHIP_ID2, &id2); if (res) return res; @@ -78,6 +76,10 @@ static int ps8740_set_mux(const struct usb_mux *me, mux_state_t mux_state, /* This driver does not use host command ACKs */ *ack_required = false; + /* This driver treats safe mode as none */ + if (mux_state == USB_PD_MUX_SAFE_MODE) + mux_state = USB_PD_MUX_NONE; + if (mux_state & USB_PD_MUX_USB_ENABLED) reg |= PS8740_MODE_USB_ENABLED; if (mux_state & USB_PD_MUX_DP_ENABLED) |