summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiana Z <dzigterman@chromium.org>2021-01-21 22:49:46 -0700
committerCommit Bot <commit-bot@chromium.org>2021-01-27 21:30:37 +0000
commit0a142f8365840439ef08518004122209183bdb14 (patch)
tree479efaa9e9bd9a0026ce97d6429d2b62907ef84f
parent131bfec0799e497860cc80674ab86dc19540787f (diff)
downloadchrome-ec-0a142f8365840439ef08518004122209183bdb14.tar.gz
COIL: Rename fusb302 driver variables
Rename i2c variables in the fusb302 driver and c-file references. BRANCH=None BUG=None TEST=make -j buildall Signed-off-by: Diana Z <dzigterman@chromium.org> Change-Id: Ifaf7984c52fc197403d447e00c02af036e54987e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2649354 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat
-rw-r--r--board/burnet/board.c2
-rw-r--r--board/cerise/board.c2
-rw-r--r--board/damu/board.c2
-rw-r--r--board/fennel/board.c2
-rw-r--r--board/jacuzzi/board.c2
-rw-r--r--board/kappa/board.c2
-rw-r--r--board/rainier/board.c2
-rw-r--r--board/scarlet/board.c2
-rw-r--r--board/servo_v4p1/fusb302b.c4
-rw-r--r--board/servo_v4p1/fusb302b.h10
-rw-r--r--board/stern/board.c2
-rw-r--r--board/willow/board.c2
-rw-r--r--driver/tcpm/fusb302.h10
13 files changed, 22 insertions, 22 deletions
diff --git a/board/burnet/board.c b/board/burnet/board.c
index 1ba9ec173f..f4a11d3d92 100644
--- a/board/burnet/board.c
+++ b/board/burnet/board.c
@@ -132,7 +132,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/board/cerise/board.c b/board/cerise/board.c
index 24b0b8322c..585f40197c 100644
--- a/board/cerise/board.c
+++ b/board/cerise/board.c
@@ -133,7 +133,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/board/damu/board.c b/board/damu/board.c
index b711be9d28..b4ad13b3e8 100644
--- a/board/damu/board.c
+++ b/board/damu/board.c
@@ -133,7 +133,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/board/fennel/board.c b/board/fennel/board.c
index ff9fabda65..59c6b47651 100644
--- a/board/fennel/board.c
+++ b/board/fennel/board.c
@@ -132,7 +132,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c
index 53a6fca7f7..6c3707ce10 100644
--- a/board/jacuzzi/board.c
+++ b/board/jacuzzi/board.c
@@ -137,7 +137,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/board/kappa/board.c b/board/kappa/board.c
index e65d0834e2..b11699ecf1 100644
--- a/board/kappa/board.c
+++ b/board/kappa/board.c
@@ -131,7 +131,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/board/rainier/board.c b/board/rainier/board.c
index 3814cd408b..2d5140eed6 100644
--- a/board/rainier/board.c
+++ b/board/rainier/board.c
@@ -131,7 +131,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/board/scarlet/board.c b/board/scarlet/board.c
index 6ce154e555..c1beb0882a 100644
--- a/board/scarlet/board.c
+++ b/board/scarlet/board.c
@@ -137,7 +137,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/board/servo_v4p1/fusb302b.c b/board/servo_v4p1/fusb302b.c
index fabb5b80ad..4e144dec05 100644
--- a/board/servo_v4p1/fusb302b.c
+++ b/board/servo_v4p1/fusb302b.c
@@ -21,12 +21,12 @@ static struct mutex measure_lock;
static int tcpc_write(int reg, int val)
{
- return i2c_write8(port, FUSB302_I2C_SLAVE_ADDR_FLAGS, reg, val);
+ return i2c_write8(port, FUSB302_I2C_ADDR_FLAGS, reg, val);
}
static int tcpc_read(int reg, int *val)
{
- return i2c_read8(port, FUSB302_I2C_SLAVE_ADDR_FLAGS, reg, val);
+ return i2c_read8(port, FUSB302_I2C_ADDR_FLAGS, reg, val);
}
int init_fusb302b(int p)
diff --git a/board/servo_v4p1/fusb302b.h b/board/servo_v4p1/fusb302b.h
index eddc97b7ca..ec89c0c207 100644
--- a/board/servo_v4p1/fusb302b.h
+++ b/board/servo_v4p1/fusb302b.h
@@ -12,15 +12,15 @@
#define FUSB302_DEVID_302A 0x08
#define FUSB302_DEVID_302B 0x09
-/* I2C slave address varies by part number */
+/* I2C address varies by part number */
/* FUSB302BUCX / FUSB302BMPX */
-#define FUSB302_I2C_SLAVE_ADDR_FLAGS 0x22
+#define FUSB302_I2C_ADDR_FLAGS 0x22
/* FUSB302B01MPX */
-#define FUSB302_I2C_SLAVE_ADDR_B01_FLAGS 0x23
+#define FUSB302_I2C_ADDR_B01_FLAGS 0x23
/* FUSB302B10MPX */
-#define FUSB302_I2C_SLAVE_ADDR_B10_FLAGS 0x24
+#define FUSB302_I2C_ADDR_B10_FLAGS 0x24
/* FUSB302B11MPX */
-#define FUSB302_I2C_SLAVE_ADDR_B11_FLAGS 0x25
+#define FUSB302_I2C_ADDR_B11_FLAGS 0x25
#define TCPC_REG_DEVICE_ID 0x01
diff --git a/board/stern/board.c b/board/stern/board.c
index 91bcf76300..ac6e2775fa 100644
--- a/board/stern/board.c
+++ b/board/stern/board.c
@@ -133,7 +133,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/board/willow/board.c b/board/willow/board.c
index 47fc99063b..d8b5e82b44 100644
--- a/board/willow/board.c
+++ b/board/willow/board.c
@@ -131,7 +131,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.bus_type = EC_BUS_TYPE_I2C,
.i2c_info = {
.port = I2C_PORT_TCPC0,
- .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ .addr_flags = FUSB302_I2C_ADDR_FLAGS,
},
.drv = &fusb302_tcpm_drv,
},
diff --git a/driver/tcpm/fusb302.h b/driver/tcpm/fusb302.h
index 8db9f86c20..717b28df18 100644
--- a/driver/tcpm/fusb302.h
+++ b/driver/tcpm/fusb302.h
@@ -14,15 +14,15 @@
#define FUSB302_DEVID_302A 0x08
#define FUSB302_DEVID_302B 0x09
-/* I2C slave address varies by part number */
+/* I2C address varies by part number */
/* FUSB302BUCX / FUSB302BMPX */
-#define FUSB302_I2C_SLAVE_ADDR_FLAGS 0x22
+#define FUSB302_I2C_ADDR_FLAGS 0x22
/* FUSB302B01MPX */
-#define FUSB302_I2C_SLAVE_ADDR_B01_FLAGS 0x23
+#define FUSB302_I2C_ADDR_B01_FLAGS 0x23
/* FUSB302B10MPX */
-#define FUSB302_I2C_SLAVE_ADDR_B10_FLAGS 0x24
+#define FUSB302_I2C_ADDR_B10_FLAGS 0x24
/* FUSB302B11MPX */
-#define FUSB302_I2C_SLAVE_ADDR_B11_FLAGS 0x25
+#define FUSB302_I2C_ADDR_B11_FLAGS 0x25
#define TCPC_REG_DEVICE_ID 0x01
View Lorry Controller Status