zephyr: emul: update EMUL_DT_INST_DEFINE API usage

Update various instances of the EMUL_DT_INST_DEFINE to set the extra
argument introduced in:

  6062914cf2 emul: Add support for backend APIs

BRANCH=none
BUG=none
TEST=./twister

Cq-Depend: chromium:4200298
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I2bcec5786e78840fd552dcbde1b50f6941a23f05
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4188744
Reviewed-by: Keith Short <keithshort@chromium.org>

20 files changed, 25 insertions, 21 deletions

diff --git a/zephyr/emul/emul_bb_retimer.c b/zephyr/emul/emul_bb_retimer.c
index 8028c53c0f..10f0fa591d 100644
--- a/zephyr/emul/emul_bb_retimer.c
+++ b/zephyr/emul/emul_bb_retimer.c
@@ -328,7 +328,7 @@ static int bb_emul_init(const struct emul *emul, const struct device *parent)
 		.addr = DT_INST_REG_ADDR(n),                        \
 	};                                                          \
 	EMUL_DT_INST_DEFINE(n, bb_emul_init, &bb_emul_data_##n,     \
-			    &bb_emul_cfg_##n, &i2c_common_emul_api)
+			    &bb_emul_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(BB_RETIMER_EMUL)
 
diff --git a/zephyr/emul/emul_bma255.c b/zephyr/emul/emul_bma255.c
index 2afe1f722e..cd85c74872 100644
--- a/zephyr/emul/emul_bma255.c
+++ b/zephyr/emul/emul_bma255.c
@@ -1005,7 +1005,7 @@ static int bma_emul_init(const struct emul *emul, const struct device *parent)
 		.addr = DT_INST_REG_ADDR(n),                         \
 	};                                                           \
 	EMUL_DT_INST_DEFINE(n, bma_emul_init, &bma_emul_data_##n,    \
-			    &bma_emul_cfg_##n, &i2c_common_emul_api)
+			    &bma_emul_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(BMA255_EMUL)
 
diff --git a/zephyr/emul/emul_bmi.c b/zephyr/emul/emul_bmi.c
index d0f5691402..f80c8202b1 100644
--- a/zephyr/emul/emul_bmi.c
+++ b/zephyr/emul/emul_bmi.c
@@ -1105,7 +1105,7 @@ static int bmi_emul_init(const struct emul *emul, const struct device *parent)
 		.addr = DT_INST_REG_ADDR(n),                         \
 	};                                                           \
 	EMUL_DT_INST_DEFINE(n, bmi_emul_init, &bmi_emul_data_##n,    \
-			    &bmi_emul_cfg_##n, &i2c_common_emul_api)
+			    &bmi_emul_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(BMI_EMUL)
 
diff --git a/zephyr/emul/emul_isl923x.c b/zephyr/emul/emul_isl923x.c
index d46f1131d4..42401b94f9 100644
--- a/zephyr/emul/emul_isl923x.c
+++ b/zephyr/emul/emul_isl923x.c
@@ -435,7 +435,7 @@ static int emul_isl923x_init(const struct emul *emul,
 		},                                                             \
 	}; \
 	EMUL_DT_INST_DEFINE(n, emul_isl923x_init, &isl923x_emul_data_##n,        \
-			    &isl923x_emul_cfg_##n, &i2c_common_emul_api)
+			    &isl923x_emul_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_ISL923X)
 
diff --git a/zephyr/emul/emul_lis2dw12.c b/zephyr/emul/emul_lis2dw12.c
index 547e74912c..cd04cd27b5 100644
--- a/zephyr/emul/emul_lis2dw12.c
+++ b/zephyr/emul/emul_lis2dw12.c
@@ -293,7 +293,8 @@ void lis2dw12_emul_clear_accel_reading(const struct emul *emul)
 		},                                                        \
 	}; \
 	EMUL_DT_INST_DEFINE(n, emul_lis2dw12_init, &lis2dw12_emul_data_##n, \
-			    &lis2dw12_emul_cfg_##n, &i2c_common_emul_api)
+			    &lis2dw12_emul_cfg_##n, &i2c_common_emul_api,   \
+			    NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_LIS2DW12)
 DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE);
diff --git a/zephyr/emul/emul_ln9310.c b/zephyr/emul/emul_ln9310.c
index 9d6a0197a0..21cfa74a27 100644
--- a/zephyr/emul/emul_ln9310.c
+++ b/zephyr/emul/emul_ln9310.c
@@ -505,7 +505,7 @@ static int emul_ln9310_init(const struct emul *emul,
 		.addr = DT_INST_REG_ADDR(n),                                     \
 	};                                                                       \
 	EMUL_DT_INST_DEFINE(n, emul_ln9310_init, &ln9310_emul_data_##n,          \
-			    &ln9310_emul_cfg_##n, &i2c_common_emul_api)
+			    &ln9310_emul_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_LN9310)
 DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE);
diff --git a/zephyr/emul/emul_pct2075.c b/zephyr/emul/emul_pct2075.c
index cfd172b6dc..3388db4ad4 100644
--- a/zephyr/emul/emul_pct2075.c
+++ b/zephyr/emul/emul_pct2075.c
@@ -100,7 +100,7 @@ static int pct2075_emul_init(const struct emul *emul,
 		},                                                   \
 	}; \
 	EMUL_DT_INST_DEFINE(n, pct2075_emul_init, &pct2075_data_##n,   \
-			    &common_cfg_##n, &i2c_common_emul_api)
+			    &common_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_PCT2075_EMUL)
 
diff --git a/zephyr/emul/emul_pi3usb9201.c b/zephyr/emul/emul_pi3usb9201.c
index a722fc3039..ca3818a812 100644
--- a/zephyr/emul/emul_pi3usb9201.c
+++ b/zephyr/emul/emul_pi3usb9201.c
@@ -174,7 +174,8 @@ static int pi3usb9201_emul_init(const struct emul *emul,
 	};                                                                  \
 	EMUL_DT_INST_DEFINE(n, pi3usb9201_emul_init,                        \
 			    &pi3usb9201_emul_data_##n,                      \
-			    &pi3usb9201_emul_cfg_##n, &pi3usb9201_emul_api)
+			    &pi3usb9201_emul_cfg_##n, &pi3usb9201_emul_api, \
+			    NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(PI3USB9201_EMUL)
 
diff --git a/zephyr/emul/emul_rt9490.c b/zephyr/emul/emul_rt9490.c
index 1775bc9235..290ae6c4da 100644
--- a/zephyr/emul/emul_rt9490.c
+++ b/zephyr/emul/emul_rt9490.c
@@ -115,7 +115,7 @@ static int rt9490_emul_init(const struct emul *emul,
 		.common = { .cfg = &common_cfg_##n }               \
 	};                                                         \
 	EMUL_DT_INST_DEFINE(n, rt9490_emul_init, &rt9490_data_##n, \
-			    &common_cfg_##n, &i2c_common_emul_api)
+			    &common_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_RT9490_EMUL)
 
diff --git a/zephyr/emul/emul_smart_battery.c b/zephyr/emul/emul_smart_battery.c
index acada754d7..a935a71921 100644
--- a/zephyr/emul/emul_smart_battery.c
+++ b/zephyr/emul/emul_smart_battery.c
@@ -885,7 +885,7 @@ DT_INST_FOREACH_STATUS_OKAY(SMART_BATTERY_VALIDATE_STRING_PROPS_SIZE)
 		.addr = DT_INST_REG_ADDR(n),                          \
 	};                                                            \
 	EMUL_DT_INST_DEFINE(n, sbat_emul_init, &sbat_emul_data_##n,   \
-			    &sbat_emul_cfg_##n, &i2c_common_emul_api)
+			    &sbat_emul_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(SMART_BATTERY_EMUL)
 
diff --git a/zephyr/emul/emul_sn5s330.c b/zephyr/emul/emul_sn5s330.c
index 96342abf70..36f21775c5 100644
--- a/zephyr/emul/emul_sn5s330.c
+++ b/zephyr/emul/emul_sn5s330.c
@@ -348,7 +348,7 @@ static int emul_sn5s330_init(const struct emul *emul,
 		},                                                             \
 	}; \
 	EMUL_DT_INST_DEFINE(n, emul_sn5s330_init, &sn5s330_emul_data_##n,        \
-			    &sn5s330_emul_cfg_##n, &i2c_common_emul_api)
+			    &sn5s330_emul_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_SN5S330)
 DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE);
diff --git a/zephyr/emul/emul_syv682x.c b/zephyr/emul/emul_syv682x.c
index 68c1a84e15..712dca2276 100644
--- a/zephyr/emul/emul_syv682x.c
+++ b/zephyr/emul/emul_syv682x.c
@@ -270,7 +270,7 @@ static int syv682x_emul_init(const struct emul *emul,
 		},                                                             \
 	}; \
 	EMUL_DT_INST_DEFINE(n, syv682x_emul_init, &syv682x_emul_data_##n,        \
-			    &syv682x_emul_cfg_##n, &i2c_common_emul_api)
+			    &syv682x_emul_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(SYV682X_EMUL)
 
diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c
index 0266fe2998..fe64acf791 100644
--- a/zephyr/emul/emul_tcs3400.c
+++ b/zephyr/emul/emul_tcs3400.c
@@ -616,7 +616,7 @@ static int tcs_emul_init(const struct emul *emul, const struct device *parent)
 		.addr = DT_INST_REG_ADDR(n),                         \
 	};                                                           \
 	EMUL_DT_INST_DEFINE(n, tcs_emul_init, &tcs_emul_data_##n,    \
-			    &tcs_emul_cfg_##n, &i2c_common_emul_api)
+			    &tcs_emul_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(TCS3400_EMUL)
 
diff --git a/zephyr/emul/emul_tusb1064.c b/zephyr/emul/emul_tusb1064.c
index 866493bc32..292fd8f4c6 100644
--- a/zephyr/emul/emul_tusb1064.c
+++ b/zephyr/emul/emul_tusb1064.c
@@ -101,7 +101,7 @@ static int tusb1064_emul_init(const struct emul *emul,
 		.common = { .cfg = &common_cfg_##n }                   \
 	};                                                             \
 	EMUL_DT_INST_DEFINE(n, tusb1064_emul_init, &tusb1064_data_##n, \
-			    &common_cfg_##n, &i2c_common_emul_api)
+			    &common_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_TUSB1064_EMUL)
 
diff --git a/zephyr/emul/i2c_mock.c b/zephyr/emul/i2c_mock.c
index c906e76c13..cb5d7fc729 100644
--- a/zephyr/emul/i2c_mock.c
+++ b/zephyr/emul/i2c_mock.c
@@ -63,7 +63,7 @@ static int i2c_mock_init(const struct emul *emul, const struct device *parent)
 	};                                                           \
 	static struct i2c_common_emul_data i2c_mock_data_##n;        \
 	EMUL_DT_INST_DEFINE(n, i2c_mock_init, &i2c_mock_data_##n,    \
-			    &i2c_mock_cfg_##n, &i2c_common_emul_api)
+			    &i2c_mock_cfg_##n, &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_I2C_MOCK)
 
diff --git a/zephyr/emul/tcpc/emul_anx7447.c b/zephyr/emul/tcpc/emul_anx7447.c
index fb15e2eb4e..26d172f90f 100644
--- a/zephyr/emul/tcpc/emul_anx7447.c
+++ b/zephyr/emul/tcpc/emul_anx7447.c
@@ -146,7 +146,7 @@ struct i2c_emul_api i2c_anx7447_emul_api = {
 
 #define ANX7447_EMUL(n)                                     \
 	TCPCI_EMUL_DEFINE(n, anx7447_emul_init, NULL, NULL, \
-			  &i2c_anx7447_emul_api)
+			  &i2c_anx7447_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(ANX7447_EMUL)
 
diff --git a/zephyr/emul/tcpc/emul_ps8xxx.c b/zephyr/emul/tcpc/emul_ps8xxx.c
index d0be005144..fc94b4f9d6 100644
--- a/zephyr/emul/tcpc/emul_ps8xxx.c
+++ b/zephyr/emul/tcpc/emul_ps8xxx.c
@@ -676,7 +676,7 @@ static int ps8xxx_emul_init(const struct emul *emul,
 		},							\
 	}; \
 	TCPCI_EMUL_DEFINE(n, ps8xxx_emul_init, &ps8xxx_emul_cfg_##n,  \
-			  &ps8xxx_emul_data_##n, &i2c_ps8xxx_emul_api)
+			  &ps8xxx_emul_data_##n, &i2c_ps8xxx_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(PS8XXX_EMUL)
 
diff --git a/zephyr/emul/tcpc/emul_tcpci_generic.c b/zephyr/emul/tcpc/emul_tcpci_generic.c
index 01fae7c978..3b6695f953 100644
--- a/zephyr/emul/tcpc/emul_tcpci_generic.c
+++ b/zephyr/emul/tcpc/emul_tcpci_generic.c
@@ -153,7 +153,7 @@ struct i2c_emul_api i2c_tcpci_generic_emul_api = {
 
 #define TCPCI_GENERIC_EMUL(n)                                     \
 	TCPCI_EMUL_DEFINE(n, tcpci_generic_emul_init, NULL, NULL, \
-			  &i2c_tcpci_generic_emul_api)
+			  &i2c_tcpci_generic_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(TCPCI_GENERIC_EMUL)
 
diff --git a/zephyr/include/emul/tcpc/emul_tcpci.h b/zephyr/include/emul/tcpc/emul_tcpci.h
index 8badf7dbc4..5a7777d6ad 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci.h
@@ -95,7 +95,8 @@ struct tcpc_emul_data {
 	const struct i2c_common_emul_cfg i2c_cfg;
 };
 
-#define TCPCI_EMUL_DEFINE(n, init, cfg_ptr, chip_data_ptr, bus_api)          \
+#define TCPCI_EMUL_DEFINE(n, init, cfg_ptr, chip_data_ptr, bus_api,          \
+			  backend_api)                                       \
 	static uint8_t tcpci_emul_tx_buf_##n[128];                           \
 	static struct tcpci_emul_msg tcpci_emul_tx_msg_##n = {               \
 		.buf = tcpci_emul_tx_buf_##n,                                \
@@ -123,7 +124,8 @@ struct tcpc_emul_data {
 			.addr = DT_INST_REG_ADDR(n),                       \
 		},                                                         \
 	}; \
-	EMUL_DT_INST_DEFINE(n, init, &tcpc_emul_data_##n, cfg_ptr, bus_api)
+	EMUL_DT_INST_DEFINE(n, init, &tcpc_emul_data_##n, cfg_ptr, bus_api,  \
+			    backend_api)
 
 /** Response from TCPCI specific device operations */
 enum tcpci_emul_ops_resp {
diff --git a/zephyr/test/drivers/i2c_controller/src/basic_i2c_device_emul.c b/zephyr/test/drivers/i2c_controller/src/basic_i2c_device_emul.c
index 8d00d5d3ba..926fa6152f 100644
--- a/zephyr/test/drivers/i2c_controller/src/basic_i2c_device_emul.c
+++ b/zephyr/test/drivers/i2c_controller/src/basic_i2c_device_emul.c
@@ -105,7 +105,7 @@ static int basic_i2c_device_init(const struct emul *emul,
 	};                                                                \
 	EMUL_DT_INST_DEFINE(n, basic_i2c_device_init,                     \
 			    &basic_i2c_device_data_##n, &common_cfg_##n,  \
-			    &i2c_common_emul_api)
+			    &i2c_common_emul_api, NULL)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_BASIC_I2C_DEVICE_EMUL);