diff options
Diffstat (limited to 'driver/usb_mux')
| -rw-r--r-- | driver/usb_mux/it5205.c | 4 | ||||
| -rw-r--r-- | driver/usb_mux/it5205.h | 4 | ||||
| -rw-r--r-- | driver/usb_mux/pi3usb30532.c | 8 | ||||
| -rw-r--r-- | driver/usb_mux/ps874x.c | 8 |
4 files changed, 16 insertions, 8 deletions
diff --git a/driver/usb_mux/it5205.c b/driver/usb_mux/it5205.c index 9a6f71dade..745a341591 100644 --- a/driver/usb_mux/it5205.c +++ b/driver/usb_mux/it5205.c @@ -16,12 +16,12 @@ static int it5205_read(int port, uint8_t reg, int *val) { - return i2c_read8(I2C_PORT_USB_MUX, MUX_ADDR(port), reg, val); + return i2c_read8__7bf(I2C_PORT_USB_MUX, MUX_ADDR__7bf(port), reg, val); } static int it5205_write(int port, uint8_t reg, uint8_t val) { - return i2c_write8(I2C_PORT_USB_MUX, MUX_ADDR(port), reg, val); + return i2c_write8__7bf(I2C_PORT_USB_MUX, MUX_ADDR__7bf(port), reg, val); } struct mux_chip_id_t { diff --git a/driver/usb_mux/it5205.h b/driver/usb_mux/it5205.h index b81b33cac3..02d389ad36 100644 --- a/driver/usb_mux/it5205.h +++ b/driver/usb_mux/it5205.h @@ -9,8 +9,8 @@ #define __CROS_EC_IT5205_H /* I2C interface */ -#define IT5205_I2C_ADDR1 (0x48 << 1) -#define IT5205_I2C_ADDR2 (0x58 << 1) +#define IT5205_I2C_ADDR1__7bf (0x48) +#define IT5205_I2C_ADDR2__7bf (0x58) /* Chip ID registers */ #define IT5205_REG_CHIP_ID3 0x4 diff --git a/driver/usb_mux/pi3usb30532.c b/driver/usb_mux/pi3usb30532.c index 54d6f49fe7..24f9cbd095 100644 --- a/driver/usb_mux/pi3usb30532.c +++ b/driver/usb_mux/pi3usb30532.c @@ -20,7 +20,9 @@ static int pi3usb30532_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__7bf(I2C_PORT_USB_MUX, + MUX_ADDR__7bf(port), + 0, &read); if (res) return res; @@ -37,7 +39,9 @@ static int pi3usb30532_write(int port, uint8_t reg, uint8_t val) if (reg != PI3USB30532_REG_CONTROL) return EC_ERROR_UNKNOWN; - return i2c_write8(I2C_PORT_USB_MUX, MUX_ADDR(port), 0, val); + return i2c_write8__7bf(I2C_PORT_USB_MUX, + MUX_ADDR__7bf(port), + 0, val); } static int pi3usb30532_reset(int port) diff --git a/driver/usb_mux/ps874x.c b/driver/usb_mux/ps874x.c index bf00553d28..73bb39bce5 100644 --- a/driver/usb_mux/ps874x.c +++ b/driver/usb_mux/ps874x.c @@ -13,12 +13,16 @@ static inline int ps874x_read(int port, uint8_t reg, int *val) { - return i2c_read8(I2C_PORT_USB_MUX, MUX_ADDR(port), reg, val); + return i2c_read8__7bf(I2C_PORT_USB_MUX, + MUX_ADDR__7bf(port), + reg, val); } static inline int ps874x_write(int port, uint8_t reg, uint8_t val) { - return i2c_write8(I2C_PORT_USB_MUX, MUX_ADDR(port), reg, val); + return i2c_write8__7bf(I2C_PORT_USB_MUX, + MUX_ADDR__7bf(port), + reg, val); } static int ps874x_init(int port) |