diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-01-05 17:01:14 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-07 19:21:50 +0000 |
| commit | 2be9f07b1e2e6d23d6592ac34fad3e3fd5d3b60f (patch) | |
| tree | 4bd23a2e88a6549c75a01ed6fd248f09abacdcd7 | |
| parent | 74d1673daa17d9503f21cdf86bfd552873d1aefa (diff) | |
| download | chrome-ec-2be9f07b1e2e6d23d6592ac34fad3e3fd5d3b60f.tar.gz | |
coil: I2C_PORT_MASTER -> I2C_PORT_CONTROLLER
BUG=b:175244613
TEST=make buildall -j
Change-Id: If5b5dc1b2390dfec43955ec88a959ba26b52082b
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2611758
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
| -rw-r--r-- | board/cr50/board.c | 2 | ||||
| -rw-r--r-- | board/cr50/board.h | 2 | ||||
| -rw-r--r-- | common/i2c_wedge.c | 2 | ||||
| -rw-r--r-- | driver/ina2xx.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/board/cr50/board.c b/board/cr50/board.c index 9b1ce10f6d..d9720956de 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -228,7 +228,7 @@ static int other_rw_is_inactive(void) /* I2C Port definition */ const struct i2c_port_t i2c_ports[] = { - {"master", I2C_PORT_MASTER, 100, + {"controller", I2C_PORT_CONTROLLER, 100, GPIO_I2C_SCL_INA, GPIO_I2C_SDA_INA}, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); diff --git a/board/cr50/board.h b/board/cr50/board.h index 7e3efc79bd..6eb075a022 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -515,7 +515,7 @@ enum nvmem_users { #define CONFIG_SN_BITS_SUPPORT #define CONFIG_EXTENDED_VERSION_INFO -#define I2C_PORT_MASTER 0 +#define I2C_PORT_CONTROLLER 0 #define CONFIG_BASE32 #define CONFIG_RMA_AUTH diff --git a/common/i2c_wedge.c b/common/i2c_wedge.c index ef87234cce..7b52698ed5 100644 --- a/common/i2c_wedge.c +++ b/common/i2c_wedge.c @@ -10,7 +10,7 @@ * pit: * * #define CONFIG_CMD_I2CWEDGE - * #define I2C_PORT_HOST I2C_PORT_MASTER + * #define I2C_PORT_HOST I2C_PORT_CONTROLLER * */ diff --git a/driver/ina2xx.c b/driver/ina2xx.c index 2b0fca07e5..66c8742957 100644 --- a/driver/ina2xx.c +++ b/driver/ina2xx.c @@ -24,7 +24,7 @@ uint16_t ina2xx_read(uint8_t idx, uint8_t reg) int res; int val; - res = i2c_read16(I2C_PORT_MASTER, INA2XX_I2C_ADDR_FLAGS | idx, + res = i2c_read16(I2C_PORT_CONTROLLER, INA2XX_I2C_ADDR_FLAGS | idx, reg, &val); if (res) { CPRINTS("INA2XX I2C read failed"); @@ -38,7 +38,7 @@ int ina2xx_write(uint8_t idx, uint8_t reg, uint16_t val) int res; uint16_t be_val = (val >> 8) | ((val & 0xff) << 8); - res = i2c_write16(I2C_PORT_MASTER, INA2XX_I2C_ADDR_FLAGS | idx, + res = i2c_write16(I2C_PORT_CONTROLLER, INA2XX_I2C_ADDR_FLAGS | idx, reg, be_val); if (res) CPRINTS("INA2XX I2C write failed"); |