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 /chip/mchp/i2c.c | |
| 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 'chip/mchp/i2c.c')
| -rw-r--r-- | chip/mchp/i2c.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chip/mchp/i2c.c b/chip/mchp/i2c.c index 489d374195..96a0914a4b 100644 --- a/chip/mchp/i2c.c +++ b/chip/mchp/i2c.c @@ -132,7 +132,7 @@ static struct { uint32_t i2c_complete; /* ISR write */ uint32_t flags; uint8_t port; - uint8_t slv_addr; + uint8_t slv_addr__8b; uint8_t ctrl; uint8_t hwsts; uint8_t hwsts2; @@ -545,7 +545,7 @@ static int i2c_mtx(int ctrl) cdata[ctrl].flags |= (1ul << 1); if (cdata[ctrl].xflags & I2C_XFER_START) { cdata[ctrl].flags |= (1ul << 2); - MCHP_I2C_DATA(ctrl) = cdata[ctrl].slv_addr; + MCHP_I2C_DATA(ctrl) = cdata[ctrl].slv_addr__8b; /* Clock out the slave address, sending START bit */ MCHP_I2C_CTRL(ctrl) = CTRL_PIN | CTRL_ESO | CTRL_ENI | CTRL_ACK | CTRL_STA; @@ -629,7 +629,7 @@ static int i2c_mrx_start(int ctrl) /* Repeated-START then address */ MCHP_I2C_CTRL(ctrl) = u8; } - MCHP_I2C_DATA(ctrl) = cdata[ctrl].slv_addr | 0x01; + MCHP_I2C_DATA(ctrl) = cdata[ctrl].slv_addr__8b | 0x01; if (cdata[ctrl].transaction_state == I2C_TRANSACTION_STOPPED) { cdata[ctrl].flags |= (1ul << 6); /* address then START */ @@ -716,8 +716,9 @@ static int i2c_mrx_data(int ctrl) /* * Called from common/i2c_master */ -int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, - int out_size, uint8_t *in, int in_size, int flags) +int chip_i2c_xfer__7bf(int port, uint16_t slave_addr__7bf, + const uint8_t *out, int out_size, + uint8_t *in, int in_size, int flags) { int ctrl; int ret_done; @@ -739,8 +740,8 @@ int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, cdata[ctrl].hwsts2 = 0; cdata[ctrl].hwsts3 = 0; cdata[ctrl].hwsts4 = 0; - cdata[ctrl].port = (uint8_t)(port & 0xff); - cdata[ctrl].slv_addr = (uint8_t)(slave_addr & 0xff); + cdata[ctrl].port = port & 0xff; + cdata[ctrl].slv_addr__8b = I2C_GET_ADDR__7b(slave_addr__7bf) << 1; cdata[ctrl].out_size = out_size; cdata[ctrl].outp = out; cdata[ctrl].in_size = in_size; |