summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorDiana Z <dzigterman@chromium.org>2021-02-16 10:45:57 -0700
committerCommit Bot <commit-bot@chromium.org>2021-02-24 19:09:44 +0000
commit3c012e5950599f0a81dadc351ecf23ee5f84e404 (patch)
tree93f18ef7c47616b522395a80339a9ee3e90f343c /board
parentec935993f233a8b1329757fc5716a5de1b200d00 (diff)
downloadchrome-ec-3c012e5950599f0a81dadc351ecf23ee5f84e404.tar.gz
COIL: Rename ioexpander i2c address variable
Rename ioexpander i2c address to match current conventions and update any calling locations. BRANCH=None BUG=None TEST=make -j buildall Signed-off-by: Diana Z <dzigterman@chromium.org> Change-Id: Iddad457f73d0dd0167496b794c00e274f8985615 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2697855 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/burnet/board.c2
-rw-r--r--board/cerise/board.c2
-rw-r--r--board/dalboz/board.c6
-rw-r--r--board/damu/board.c2
-rw-r--r--board/dirinboz/board.c4
-rw-r--r--board/fennel/board.c2
-rw-r--r--board/gumboz/board.c4
-rw-r--r--board/jacuzzi/board.c2
-rw-r--r--board/kappa/board.c2
-rw-r--r--board/servo_v4p1/board.c4
-rw-r--r--board/shuboz/board.c4
-rw-r--r--board/stern/board.c2
-rw-r--r--board/vilboz/board.c2
-rw-r--r--board/willow/board.c2
14 files changed, 20 insertions, 20 deletions
diff --git a/board/burnet/board.c b/board/burnet/board.c
index cdc4641766..6b4fc4a44f 100644
--- a/board/burnet/board.c
+++ b/board/burnet/board.c
@@ -107,7 +107,7 @@ struct keyboard_scan_config keyscan_config = {
struct ioexpander_config_t ioex_config[CONFIG_IO_EXPANDER_PORT_COUNT] = {
[0] = {
.i2c_host_port = I2C_PORT_IO_EXPANDER_IT8801,
- .i2c_slave_addr = IT8801_I2C_ADDR,
+ .i2c_addr_flags = IT8801_I2C_ADDR,
.drv = &it8801_ioexpander_drv,
},
};
diff --git a/board/cerise/board.c b/board/cerise/board.c
index ff6fd76ea3..f167795c3c 100644
--- a/board/cerise/board.c
+++ b/board/cerise/board.c
@@ -108,7 +108,7 @@ struct keyboard_scan_config keyscan_config = {
struct ioexpander_config_t ioex_config[CONFIG_IO_EXPANDER_PORT_COUNT] = {
[0] = {
.i2c_host_port = I2C_PORT_IO_EXPANDER_IT8801,
- .i2c_slave_addr = IT8801_I2C_ADDR,
+ .i2c_addr_flags = IT8801_I2C_ADDR,
.drv = &it8801_ioexpander_drv,
},
};
diff --git a/board/dalboz/board.c b/board/dalboz/board.c
index 28114fb361..49b3d118eb 100644
--- a/board/dalboz/board.c
+++ b/board/dalboz/board.c
@@ -622,18 +622,18 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
struct ioexpander_config_t ioex_config[] = {
[IOEX_C0_NCT3807] = {
.i2c_host_port = I2C_PORT_TCPC0,
- .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS,
+ .i2c_addr_flags = NCT38XX_I2C_ADDR1_1_FLAGS,
.drv = &nct38xx_ioexpander_drv,
},
[IOEX_C1_NCT3807] = {
.i2c_host_port = I2C_PORT_TCPC1,
- .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS,
+ .i2c_addr_flags = NCT38XX_I2C_ADDR1_1_FLAGS,
.drv = &nct38xx_ioexpander_drv,
.flags = IOEX_FLAGS_DISABLED,
},
[IOEX_HDMI_PCAL6408] = {
.i2c_host_port = I2C_PORT_TCPC1,
- .i2c_slave_addr = PCAL6408_I2C_ADDR0,
+ .i2c_addr_flags = PCAL6408_I2C_ADDR0,
.drv = &pcal6408_ioexpander_drv,
.flags = IOEX_FLAGS_DISABLED,
},
diff --git a/board/damu/board.c b/board/damu/board.c
index b945347c46..5e431a66d0 100644
--- a/board/damu/board.c
+++ b/board/damu/board.c
@@ -108,7 +108,7 @@ struct keyboard_scan_config keyscan_config = {
struct ioexpander_config_t ioex_config[CONFIG_IO_EXPANDER_PORT_COUNT] = {
[0] = {
.i2c_host_port = I2C_PORT_IO_EXPANDER_IT8801,
- .i2c_slave_addr = IT8801_I2C_ADDR,
+ .i2c_addr_flags = IT8801_I2C_ADDR,
.drv = &it8801_ioexpander_drv,
},
};
diff --git a/board/dirinboz/board.c b/board/dirinboz/board.c
index 135b84af90..45006ec40e 100644
--- a/board/dirinboz/board.c
+++ b/board/dirinboz/board.c
@@ -504,12 +504,12 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
struct ioexpander_config_t ioex_config[] = {
[IOEX_C0_NCT3807] = {
.i2c_host_port = I2C_PORT_TCPC0,
- .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS,
+ .i2c_addr_flags = NCT38XX_I2C_ADDR1_1_FLAGS,
.drv = &nct38xx_ioexpander_drv,
},
[IOEX_C1_NCT3807] = {
.i2c_host_port = I2C_PORT_TCPC1,
- .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS,
+ .i2c_addr_flags = NCT38XX_I2C_ADDR1_1_FLAGS,
.drv = &nct38xx_ioexpander_drv,
},
};
diff --git a/board/fennel/board.c b/board/fennel/board.c
index 0e0dd477fe..1258fd35a0 100644
--- a/board/fennel/board.c
+++ b/board/fennel/board.c
@@ -107,7 +107,7 @@ struct keyboard_scan_config keyscan_config = {
struct ioexpander_config_t ioex_config[CONFIG_IO_EXPANDER_PORT_COUNT] = {
[0] = {
.i2c_host_port = I2C_PORT_IO_EXPANDER_IT8801,
- .i2c_slave_addr = IT8801_I2C_ADDR,
+ .i2c_addr_flags = IT8801_I2C_ADDR,
.drv = &it8801_ioexpander_drv,
},
};
diff --git a/board/gumboz/board.c b/board/gumboz/board.c
index 0abf11e8d1..825b206500 100644
--- a/board/gumboz/board.c
+++ b/board/gumboz/board.c
@@ -506,12 +506,12 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
struct ioexpander_config_t ioex_config[] = {
[IOEX_C0_NCT3807] = {
.i2c_host_port = I2C_PORT_TCPC0,
- .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS,
+ .i2c_addr_flags = NCT38XX_I2C_ADDR1_1_FLAGS,
.drv = &nct38xx_ioexpander_drv,
},
[IOEX_C1_NCT3807] = {
.i2c_host_port = I2C_PORT_TCPC1,
- .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS,
+ .i2c_addr_flags = NCT38XX_I2C_ADDR1_1_FLAGS,
.drv = &nct38xx_ioexpander_drv,
},
};
diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c
index d39a68e708..2cb25917dc 100644
--- a/board/jacuzzi/board.c
+++ b/board/jacuzzi/board.c
@@ -112,7 +112,7 @@ struct keyboard_scan_config keyscan_config = {
struct ioexpander_config_t ioex_config[CONFIG_IO_EXPANDER_PORT_COUNT] = {
[0] = {
.i2c_host_port = I2C_PORT_IO_EXPANDER_IT8801,
- .i2c_slave_addr = IT8801_I2C_ADDR,
+ .i2c_addr_flags = IT8801_I2C_ADDR,
.drv = &it8801_ioexpander_drv,
},
};
diff --git a/board/kappa/board.c b/board/kappa/board.c
index b11699ecf1..5a174a7299 100644
--- a/board/kappa/board.c
+++ b/board/kappa/board.c
@@ -106,7 +106,7 @@ struct keyboard_scan_config keyscan_config = {
struct ioexpander_config_t ioex_config[CONFIG_IO_EXPANDER_PORT_COUNT] = {
[0] = {
.i2c_host_port = I2C_PORT_IO_EXPANDER_IT8801,
- .i2c_slave_addr = IT8801_I2C_ADDR,
+ .i2c_addr_flags = IT8801_I2C_ADDR,
.drv = &it8801_ioexpander_drv,
},
};
diff --git a/board/servo_v4p1/board.c b/board/servo_v4p1/board.c
index 7d92c603c8..837891794b 100644
--- a/board/servo_v4p1/board.c
+++ b/board/servo_v4p1/board.c
@@ -508,13 +508,13 @@ struct ioexpander_config_t ioex_config[] = {
[0] = {
.drv = &tca64xxa_ioexpander_drv,
.i2c_host_port = TCA6416A_PORT,
- .i2c_slave_addr = TCA6416A_ADDR,
+ .i2c_addr_flags = TCA6416A_ADDR,
.flags = TCA64XXA_FLAG_VER_TCA6416A
},
[1] = {
.drv = &tca64xxa_ioexpander_drv,
.i2c_host_port = TCA6424A_PORT,
- .i2c_slave_addr = TCA6424A_ADDR,
+ .i2c_addr_flags = TCA6424A_ADDR,
.flags = TCA64XXA_FLAG_VER_TCA6424A
}
};
diff --git a/board/shuboz/board.c b/board/shuboz/board.c
index d9116bfd0b..05faa9e5e9 100644
--- a/board/shuboz/board.c
+++ b/board/shuboz/board.c
@@ -523,12 +523,12 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
struct ioexpander_config_t ioex_config[] = {
[IOEX_C0_NCT3807] = {
.i2c_host_port = I2C_PORT_TCPC0,
- .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS,
+ .i2c_addr_flags = NCT38XX_I2C_ADDR1_1_FLAGS,
.drv = &nct38xx_ioexpander_drv,
},
[IOEX_C1_NCT3807] = {
.i2c_host_port = I2C_PORT_TCPC1,
- .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS,
+ .i2c_addr_flags = NCT38XX_I2C_ADDR1_1_FLAGS,
.drv = &nct38xx_ioexpander_drv,
},
};
diff --git a/board/stern/board.c b/board/stern/board.c
index f75f4426af..d218df64b2 100644
--- a/board/stern/board.c
+++ b/board/stern/board.c
@@ -108,7 +108,7 @@ struct keyboard_scan_config keyscan_config = {
struct ioexpander_config_t ioex_config[CONFIG_IO_EXPANDER_PORT_COUNT] = {
[0] = {
.i2c_host_port = I2C_PORT_IO_EXPANDER_IT8801,
- .i2c_slave_addr = IT8801_I2C_ADDR,
+ .i2c_addr_flags = IT8801_I2C_ADDR,
.drv = &it8801_ioexpander_drv,
},
};
diff --git a/board/vilboz/board.c b/board/vilboz/board.c
index e6e647a386..bc747754eb 100644
--- a/board/vilboz/board.c
+++ b/board/vilboz/board.c
@@ -486,7 +486,7 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
struct ioexpander_config_t ioex_config[] = {
[IOEX_C0_NCT3807] = {
.i2c_host_port = I2C_PORT_TCPC0,
- .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS,
+ .i2c_addr_flags = NCT38XX_I2C_ADDR1_1_FLAGS,
.drv = &nct38xx_ioexpander_drv,
},
};
diff --git a/board/willow/board.c b/board/willow/board.c
index df088b266c..ee13dee75b 100644
--- a/board/willow/board.c
+++ b/board/willow/board.c
@@ -106,7 +106,7 @@ struct keyboard_scan_config keyscan_config = {
struct ioexpander_config_t ioex_config[CONFIG_IO_EXPANDER_PORT_COUNT] = {
[0] = {
.i2c_host_port = I2C_PORT_IO_EXPANDER_IT8801,
- .i2c_slave_addr = IT8801_I2C_ADDR,
+ .i2c_addr_flags = IT8801_I2C_ADDR,
.drv = &it8801_ioexpander_drv,
},
};
View Lorry Controller Status