diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2020-01-21 23:21:40 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-24 12:42:53 +0000 |
| commit | 5b21ec1b453f114e892ffa8f972f50339d6ee3fc (patch) | |
| tree | 54f1b93ddcbadec16549bfca98f33bcdf0e765ea /driver/usb_mux/pi3usb3x532.c | |
| parent | e5605acefadc9517b0475b91685e9c2a1ced7c48 (diff) | |
| download | chrome-ec-5b21ec1b453f114e892ffa8f972f50339d6ee3fc.tar.gz | |
pi3usb3x532: Pack i2c port in port_addr
The PI3USB3X532 driver in the EC assumes that all superspeed muxes are
on the same i2c bus, I2C_PORT_USB_MUX. However, that may not be true
for some boards. This commit utilizes the MUX_PORT(...) macro to
determine the i2c port to use from the usb_mux table. The boards that
use this driver have been updated to pack the i2c port in the port_addr
member. There should be no functional changes to those boards.
BUG=b:147689445
BRANCH=None
TEST=`make -j buildall`
Change-Id: If6460b84a5e39610d658f06a42ca1db0bd4da048
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2013658
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Auto-Submit: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'driver/usb_mux/pi3usb3x532.c')
| -rw-r--r-- | driver/usb_mux/pi3usb3x532.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/driver/usb_mux/pi3usb3x532.c b/driver/usb_mux/pi3usb3x532.c index c11cacf8d2..2d69f4c647 100644 --- a/driver/usb_mux/pi3usb3x532.c +++ b/driver/usb_mux/pi3usb3x532.c @@ -20,8 +20,7 @@ static int pi3usb3x532_read(int port, uint8_t reg, uint8_t *val) * Second byte read will be vendor ID. * Third byte read will be selection control. */ - res = i2c_read16(I2C_PORT_USB_MUX, MUX_ADDR(port), - 0, &read); + res = i2c_read16(MUX_PORT(port), MUX_ADDR(port), 0, &read); if (res) return res; @@ -38,8 +37,7 @@ static int pi3usb3x532_write(int port, uint8_t reg, uint8_t val) if (reg != PI3USB3X532_REG_CONTROL) return EC_ERROR_UNKNOWN; - return i2c_write8(I2C_PORT_USB_MUX, MUX_ADDR(port), - 0, val); + return i2c_write8(MUX_PORT(port), MUX_ADDR(port), 0, val); } static int pi3usb3x532_reset(int port) |