i2c: Use declared initializers for i2c_ports: eval boards

Convert all instances of i2c_ports[] to use declared initializers. This
allows the fields to be reordered without breaking code.

BUG=none
BRANCH=none
TEST=compare_build.sh

Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: Ib6f4bd684f76a34a74ddd8f476c78223b8ccf2bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3300659
Reviewed-by: Eric Yilun Lin <yllin@google.com>

11 files changed, 203 insertions, 32 deletions

diff --git a/board/fusb307bgevb/board.c b/board/fusb307bgevb/board.c
index 41b12d5a82..f3f4da1a74 100644
--- a/board/fusb307bgevb/board.c
+++ b/board/fusb307bgevb/board.c
@@ -241,7 +241,13 @@ BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT);
  * I2C interface.
  */
 const struct i2c_port_t i2c_ports[] = {
-	{"tcpc", I2C_PORT_TCPC, 400 /* kHz */, GPIO_I2C2_SCL, GPIO_I2C2_SDA}
+	{
+		.name = "tcpc",
+		.port = I2C_PORT_TCPC,
+		.kbps = 400 /* kHz */,
+		.scl  = GPIO_I2C2_SCL,
+		.sda  = GPIO_I2C2_SDA
+	}
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c
index aa74d07a0d..99e3ac9328 100644
--- a/board/mchpevb1/board.c
+++ b/board/mchpevb1/board.c
@@ -230,8 +230,20 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
  * MCHP EVB connected to KBL RVP3
  */
 const struct i2c_port_t i2c_ports[]  = {
-	{"sensors",  MCHP_I2C_PORT4, 100,  GPIO_SMB04_SCL, GPIO_SMB04_SDA},
-	{"batt",     MCHP_I2C_PORT5, 100,  GPIO_SMB05_SCL, GPIO_SMB05_SDA},
+	{
+		.name = "sensors",
+		.port = MCHP_I2C_PORT4,
+		.kbps = 100,
+		.scl  = GPIO_SMB04_SCL,
+		.sda  = GPIO_SMB04_SDA
+	},
+	{
+		.name = "batt",
+		.port = MCHP_I2C_PORT5,
+		.kbps = 100,
+		.scl  = GPIO_SMB05_SCL,
+		.sda  = GPIO_SMB05_SDA
+	},
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
diff --git a/board/npcx7_evb/board.c b/board/npcx7_evb/board.c
index 9ddaf9bd51..7909668d2c 100644
--- a/board/npcx7_evb/board.c
+++ b/board/npcx7_evb/board.c
@@ -82,11 +82,41 @@ BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT);
 /******************************************************************************/
 /* I2C ports */
 const struct i2c_port_t i2c_ports[] = {
-	{"master0-0", NPCX_I2C_PORT0_0, 100, GPIO_I2C0_SCL0, GPIO_I2C0_SDA0},
-	{"master1-0", NPCX_I2C_PORT1_0, 100, GPIO_I2C1_SCL0, GPIO_I2C1_SDA0},
-	{"master2-0", NPCX_I2C_PORT2_0, 100, GPIO_I2C2_SCL0, GPIO_I2C2_SDA0},
-	{"master3-0", NPCX_I2C_PORT3_0, 100, GPIO_I2C3_SCL0, GPIO_I2C3_SDA0},
-	{"master7-0", NPCX_I2C_PORT7_0, 100, GPIO_I2C7_SCL0, GPIO_I2C7_SDA0},
+	{
+		.name = "master0-0",
+		.port = NPCX_I2C_PORT0_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C0_SCL0,
+		.sda  = GPIO_I2C0_SDA0
+	},
+	{
+		.name = "master1-0",
+		.port = NPCX_I2C_PORT1_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C1_SCL0,
+		.sda  = GPIO_I2C1_SDA0
+	},
+	{
+		.name = "master2-0",
+		.port = NPCX_I2C_PORT2_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C2_SCL0,
+		.sda  = GPIO_I2C2_SDA0
+	},
+	{
+		.name = "master3-0",
+		.port = NPCX_I2C_PORT3_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C3_SCL0,
+		.sda  = GPIO_I2C3_SDA0
+	},
+	{
+		.name = "master7-0",
+		.port = NPCX_I2C_PORT7_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C7_SCL0,
+		.sda  = GPIO_I2C7_SDA0
+	},
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
diff --git a/board/npcx9_evb/board.c b/board/npcx9_evb/board.c
index 8bfc053fa5..b412fe8b30 100644
--- a/board/npcx9_evb/board.c
+++ b/board/npcx9_evb/board.c
@@ -103,11 +103,41 @@ BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT);
 /******************************************************************************/
 /* I2C ports */
 const struct i2c_port_t i2c_ports[] = {
-	{"master0-0", NPCX_I2C_PORT0_0, 100, GPIO_I2C0_SCL0, GPIO_I2C0_SDA0},
-	{"master1-0", NPCX_I2C_PORT1_0, 100, GPIO_I2C1_SCL0, GPIO_I2C1_SDA0},
-	{"master2-0", NPCX_I2C_PORT2_0, 100, GPIO_I2C2_SCL0, GPIO_I2C2_SDA0},
-	{"master3-0", NPCX_I2C_PORT3_0, 100, GPIO_I2C3_SCL0, GPIO_I2C3_SDA0},
-	{"master7-0", NPCX_I2C_PORT7_0, 100, GPIO_I2C7_SCL0, GPIO_I2C7_SDA0},
+	{
+		.name = "master0-0",
+		.port = NPCX_I2C_PORT0_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C0_SCL0,
+		.sda  = GPIO_I2C0_SDA0
+	},
+	{
+		.name = "master1-0",
+		.port = NPCX_I2C_PORT1_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C1_SCL0,
+		.sda  = GPIO_I2C1_SDA0
+	},
+	{
+		.name = "master2-0",
+		.port = NPCX_I2C_PORT2_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C2_SCL0,
+		.sda  = GPIO_I2C2_SDA0
+	},
+	{
+		.name = "master3-0",
+		.port = NPCX_I2C_PORT3_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C3_SCL0,
+		.sda  = GPIO_I2C3_SDA0
+	},
+	{
+		.name = "master7-0",
+		.port = NPCX_I2C_PORT7_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C7_SCL0,
+		.sda  = GPIO_I2C7_SDA0
+	},
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
diff --git a/board/npcx_evb/board.c b/board/npcx_evb/board.c
index 61e0665b7f..ee448bbbd2 100644
--- a/board/npcx_evb/board.c
+++ b/board/npcx_evb/board.c
@@ -101,11 +101,41 @@ BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT);
 /******************************************************************************/
 /* I2C ports */
 const struct i2c_port_t i2c_ports[] = {
-	{"master0-0", NPCX_I2C_PORT0_0, 100, GPIO_I2C0_SCL0, GPIO_I2C0_SDA0},
-	{"master0-1", NPCX_I2C_PORT0_1, 100, GPIO_I2C0_SCL1, GPIO_I2C0_SDA1},
-	{"master1",   NPCX_I2C_PORT1,   100, GPIO_I2C1_SCL, GPIO_I2C1_SDA},
-	{"master2",   NPCX_I2C_PORT2,   100, GPIO_I2C2_SCL, GPIO_I2C2_SDA},
-	{"master3",   NPCX_I2C_PORT3,   100, GPIO_I2C3_SCL, GPIO_I2C3_SDA},
+	{
+		.name = "master0-0",
+		.port = NPCX_I2C_PORT0_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C0_SCL0,
+		.sda  = GPIO_I2C0_SDA0
+	},
+	{
+		.name = "master0-1",
+		.port = NPCX_I2C_PORT0_1,
+		.kbps = 100,
+		.scl  = GPIO_I2C0_SCL1,
+		.sda  = GPIO_I2C0_SDA1
+	},
+	{
+		.name = "master1",
+		.port = NPCX_I2C_PORT1,
+		.kbps = 100,
+		.scl  = GPIO_I2C1_SCL,
+		.sda  = GPIO_I2C1_SDA
+	},
+	{
+		.name = "master2",
+		.port = NPCX_I2C_PORT2,
+		.kbps = 100,
+		.scl  = GPIO_I2C2_SCL,
+		.sda  = GPIO_I2C2_SDA
+	},
+	{
+		.name = "master3",
+		.port = NPCX_I2C_PORT3,
+		.kbps = 100,
+		.scl  = GPIO_I2C3_SCL,
+		.sda  = GPIO_I2C3_SDA
+	},
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
diff --git a/board/npcx_evb_arm/board.c b/board/npcx_evb_arm/board.c
index 4ee03e7a00..abb6e2279b 100644
--- a/board/npcx_evb_arm/board.c
+++ b/board/npcx_evb_arm/board.c
@@ -79,11 +79,41 @@ BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT);
 /******************************************************************************/
 /* I2C ports */
 const struct i2c_port_t i2c_ports[] = {
-	{"master0-0", NPCX_I2C_PORT0_0, 100, GPIO_I2C0_SCL0, GPIO_I2C0_SDA0},
-	{"master0-1", NPCX_I2C_PORT0_1, 100, GPIO_I2C0_SCL1, GPIO_I2C0_SDA1},
-	{"master1",   NPCX_I2C_PORT1,   100, GPIO_I2C1_SCL, GPIO_I2C1_SDA},
-	{"master2",   NPCX_I2C_PORT2,   100, GPIO_I2C2_SCL, GPIO_I2C2_SDA},
-	{"master3",   NPCX_I2C_PORT3,   100, GPIO_I2C3_SCL, GPIO_I2C3_SDA},
+	{
+		.name = "master0-0",
+		.port = NPCX_I2C_PORT0_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C0_SCL0,
+		.sda  = GPIO_I2C0_SDA0
+	},
+	{
+		.name = "master0-1",
+		.port = NPCX_I2C_PORT0_1,
+		.kbps = 100,
+		.scl  = GPIO_I2C0_SCL1,
+		.sda  = GPIO_I2C0_SDA1
+	},
+	{
+		.name = "master1",
+		.port = NPCX_I2C_PORT1,
+		.kbps = 100,
+		.scl  = GPIO_I2C1_SCL,
+		.sda  = GPIO_I2C1_SDA
+	},
+	{
+		.name = "master2",
+		.port = NPCX_I2C_PORT2,
+		.kbps = 100,
+		.scl  = GPIO_I2C2_SCL,
+		.sda  = GPIO_I2C2_SDA
+	},
+	{
+		.name = "master3",
+		.port = NPCX_I2C_PORT3,
+		.kbps = 100,
+		.scl  = GPIO_I2C3_SCL,
+		.sda  = GPIO_I2C3_SDA
+	},
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
diff --git a/board/nucleo-f072rb/board.c b/board/nucleo-f072rb/board.c
index 66e8960ce7..078af171cb 100644
--- a/board/nucleo-f072rb/board.c
+++ b/board/nucleo-f072rb/board.c
@@ -39,7 +39,13 @@ DECLARE_HOOK(HOOK_TICK, tick_event, HOOK_PRIO_DEFAULT);
 
 #ifdef CTS_MODULE_I2C
 const struct i2c_port_t i2c_ports[]  = {
-	{"test", STM32_I2C1_PORT, 100, GPIO_I2C1_SCL, GPIO_I2C1_SDA},
+	{
+		.name = "test",
+		.port = STM32_I2C1_PORT,
+		.kbps = 100,
+		.scl  = GPIO_I2C1_SCL,
+		.sda  = GPIO_I2C1_SDA
+	},
 };
 
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
diff --git a/board/nucleo-f411re/board.c b/board/nucleo-f411re/board.c
index 074507e039..96e7fefb69 100644
--- a/board/nucleo-f411re/board.c
+++ b/board/nucleo-f411re/board.c
@@ -52,8 +52,13 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
 /* I2C ports */
 const struct i2c_port_t i2c_ports[] = {
-	{"master", I2C_PORT_MASTER, 100,
-	 GPIO_MASTER_I2C_SCL, GPIO_MASTER_I2C_SDA},
+	{
+		.name = "master",
+		.port = I2C_PORT_MASTER,
+		.kbps = 100,
+		.scl  = GPIO_MASTER_I2C_SCL,
+		.sda  = GPIO_MASTER_I2C_SDA
+	},
 };
 
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
diff --git a/board/pdeval-stm32f072/board.c b/board/pdeval-stm32f072/board.c
index 8c62c10b79..525f14a4af 100644
--- a/board/pdeval-stm32f072/board.c
+++ b/board/pdeval-stm32f072/board.c
@@ -53,7 +53,13 @@ void board_reset_pd_mcu(void)
 
 /* I2C ports */
 const struct i2c_port_t i2c_ports[] = {
-	{"tcpc", I2C_PORT_TCPC, 400 /* kHz */, GPIO_I2C0_SCL, GPIO_I2C0_SDA}
+	{
+		.name = "tcpc",
+		.port = I2C_PORT_TCPC,
+		.kbps = 400 /* kHz */,
+		.scl  = GPIO_I2C0_SCL,
+		.sda  = GPIO_I2C0_SDA
+	}
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
diff --git a/board/stm32f446e-eval/board.c b/board/stm32f446e-eval/board.c
index f4cf28898c..fd6ff8bbe2 100644
--- a/board/stm32f446e-eval/board.c
+++ b/board/stm32f446e-eval/board.c
@@ -43,10 +43,20 @@ struct dwc_usb usb_ctl = {
 
 /* I2C ports */
 const struct i2c_port_t i2c_ports[] = {
-	{"i2c1", I2C_PORT_0, 100,
-		GPIO_I2C1_SCL, GPIO_I2C1_SDA},
-	{"fmpi2c4", FMPI2C_PORT_3, 100,
-		GPIO_FMPI2C_SCL, GPIO_FMPI2C_SDA},
+	{
+		.name = "i2c1",
+		.port = I2C_PORT_0,
+		.kbps = 100,
+		.scl  = GPIO_I2C1_SCL,
+		.sda  = GPIO_I2C1_SDA
+	},
+	{
+		.name = "fmpi2c4",
+		.port = FMPI2C_PORT_3,
+		.kbps = 100,
+		.scl  = GPIO_FMPI2C_SCL,
+		.sda  = GPIO_FMPI2C_SDA
+	},
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
diff --git a/board/stm32l476g-eval/board.c b/board/stm32l476g-eval/board.c
index c7ebc2c6b8..70375abe95 100644
--- a/board/stm32l476g-eval/board.c
+++ b/board/stm32l476g-eval/board.c
@@ -33,7 +33,13 @@ DECLARE_HOOK(HOOK_TICK, tick_event, HOOK_PRIO_DEFAULT);
 
 #ifdef CTS_MODULE_I2C
 const struct i2c_port_t i2c_ports[]  = {
-	{"test", STM32_I2C2_PORT, 100, GPIO_I2C2_SCL, GPIO_I2C2_SDA},
+	{
+		.name = "test",
+		.port = STM32_I2C2_PORT,
+		.kbps = 100,
+		.scl  = GPIO_I2C2_SCL,
+		.sda  = GPIO_I2C2_SDA
+	},
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 #endif