diff options
| author | Denis Brockus <dbrockus@chromium.org> | 2019-06-25 12:44:16 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-07-19 21:11:02 +0000 |
| commit | d1a18f82ed831d4e640336ff5571f5fa64bc7b36 (patch) | |
| tree | c46aeb6136de1c27c66e3d5f662e9620161bef7b /driver/bc12 | |
| parent | 1f14229fa7e499dfcee07d17add187598ff0a46c (diff) | |
| download | chrome-ec-d1a18f82ed831d4e640336ff5571f5fa64bc7b36.tar.gz | |
Use 7bit I2C/SPI slave addresses in EC
Opt for 7bit slave addresses in EC code. If 8bit is
expected by a driver, make it local and show this in
the naming.
Use __7b, __7bf and __8b as name extensions for i2c/spi
addresses used in the EC codebase. __7b indicates a
7bit address by itself. __7bf indicates a 7bit address
with optional flags attached. __8b indicates a 8bit
address by itself.
Allow space for 10bit addresses, even though this is
not currently being used by any of our attached
devices.
These extensions are for verification purposes only and
will be removed in the last pass of this ticket. I want
to make sure the variable names reflect the type to help
eliminate future 7/8/7-flags confusion.
BUG=chromium:971296
BRANCH=none
TEST=make buildall -j
Change-Id: I2fc3d1b52ce76184492b2aaff3060f486ca45f45
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1699893
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'driver/bc12')
| -rw-r--r-- | driver/bc12/pi3usb9201.c | 8 | ||||
| -rw-r--r-- | driver/bc12/pi3usb9201.h | 12 | ||||
| -rw-r--r-- | driver/bc12/pi3usb9281.c | 10 |
3 files changed, 16 insertions, 14 deletions
diff --git a/driver/bc12/pi3usb9201.c b/driver/bc12/pi3usb9201.c index ba4ab9e496..2fdb9719a5 100644 --- a/driver/bc12/pi3usb9201.c +++ b/driver/bc12/pi3usb9201.c @@ -62,15 +62,15 @@ static const struct bc12_status bc12_chg_limits[] = { static inline int raw_read8(int port, int offset, int *value) { - return i2c_read8(pi3usb2901_bc12_chips[port].i2c_port, - pi3usb2901_bc12_chips[port].i2c_addr, + return i2c_read8__7bf(pi3usb2901_bc12_chips[port].i2c_port, + pi3usb2901_bc12_chips[port].i2c_addr__7bf, offset, value); } static inline int raw_write8(int port, int offset, int value) { - return i2c_write8(pi3usb2901_bc12_chips[port].i2c_port, - pi3usb2901_bc12_chips[port].i2c_addr, + return i2c_write8__7bf(pi3usb2901_bc12_chips[port].i2c_port, + pi3usb2901_bc12_chips[port].i2c_addr__7bf, offset, value); } diff --git a/driver/bc12/pi3usb9201.h b/driver/bc12/pi3usb9201.h index 1e60e63c47..ba379ffff3 100644 --- a/driver/bc12/pi3usb9201.h +++ b/driver/bc12/pi3usb9201.h @@ -5,11 +5,11 @@ /* PI3USB9201 USB BC 1.2 Charger Detector driver definitions */ -/* 8-bit I2C address */ -#define PI3USB9201_I2C_ADDR_0 0xB8 -#define PI3USB9201_I2C_ADDR_1 0xBA -#define PI3USB9201_I2C_ADDR_2 0xBC -#define PI3USB9201_I2C_ADDR_3 0xBE +/* I2C address */ +#define PI3USB9201_I2C_ADDR_0__7bf 0x5C +#define PI3USB9201_I2C_ADDR_1__7bf 0x5D +#define PI3USB9201_I2C_ADDR_2__7bf 0x5E +#define PI3USB9201_I2C_ADDR_3__7bf 0x5F #define PI3USB9201_REG_CTRL_1 0x0 #define PI3USB9201_REG_CTRL_2 0x1 @@ -33,7 +33,7 @@ struct pi3usb2901_config_t { const int i2c_port; - const int i2c_addr; + const int i2c_addr__7bf; }; enum pi3usb9201_mode { diff --git a/driver/bc12/pi3usb9281.c b/driver/bc12/pi3usb9281.c index eba326ac3b..8d88d5a1e8 100644 --- a/driver/bc12/pi3usb9281.c +++ b/driver/bc12/pi3usb9281.c @@ -23,8 +23,8 @@ #define CPUTS(outstr) cputs(CC_USBCHARGE, outstr) #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) -/* 8-bit I2C address */ -#define PI3USB9281_I2C_ADDR (0x25 << 1) +/* I2C address */ +#define PI3USB9281_I2C_ADDR__7bf (0x25) /* Delay values */ #define PI3USB9281_SW_RESET_DELAY 20 @@ -69,7 +69,8 @@ static uint8_t pi3usb9281_do_read(int port, uint8_t reg, int with_lock) if (with_lock) select_chip(port); - res = i2c_read8(chip->i2c_port, PI3USB9281_I2C_ADDR, reg, &val); + res = i2c_read8__7bf(chip->i2c_port, PI3USB9281_I2C_ADDR__7bf, + reg, &val); if (with_lock) unselect_chip(port); @@ -99,7 +100,8 @@ static int pi3usb9281_do_write( if (with_lock) select_chip(port); - res = i2c_write8(chip->i2c_port, PI3USB9281_I2C_ADDR, reg, val); + res = i2c_write8__7bf(chip->i2c_port, PI3USB9281_I2C_ADDR__7bf, + reg, val); if (with_lock) unselect_chip(port); |