1 files changed, 18 insertions, 10 deletions

diff --git a/zephyr/emul/i2c_mock.c b/zephyr/emul/i2c_mock.c
index 207151ef6c..d4b257731c 100644
--- a/zephyr/emul/i2c_mock.c
+++ b/zephyr/emul/i2c_mock.c
@@ -6,9 +6,11 @@
 #define DT_DRV_COMPAT cros_i2c_mock
 
 #include <zephyr/device.h>
+#include <zephyr/logging/log.h>
+
 #include "emul/emul_common_i2c.h"
+#include "emul/emul_stub_device.h"
 
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_mock, CONFIG_I2C_MOCK_LOG_LEVEL);
 
 struct i2c_emul *i2c_mock_to_i2c_emul(const struct emul *emul)
@@ -20,14 +22,12 @@ struct i2c_emul *i2c_mock_to_i2c_emul(const struct emul *emul)
 
 void i2c_mock_reset(const struct emul *emul)
 {
-	struct i2c_emul *i2c_emul = i2c_mock_to_i2c_emul(emul);
-
-	i2c_common_emul_set_read_fail_reg(i2c_emul,
+	i2c_common_emul_set_read_fail_reg(emul->data,
 					  I2C_COMMON_EMUL_NO_FAIL_REG);
-	i2c_common_emul_set_write_fail_reg(i2c_emul,
+	i2c_common_emul_set_write_fail_reg(emul->data,
 					   I2C_COMMON_EMUL_NO_FAIL_REG);
-	i2c_common_emul_set_read_func(i2c_emul, NULL, NULL);
-	i2c_common_emul_set_write_func(i2c_emul, NULL, NULL);
+	i2c_common_emul_set_read_func(emul->data, NULL, NULL);
+	i2c_common_emul_set_write_func(emul->data, NULL, NULL);
 }
 
 uint16_t i2c_mock_get_addr(const struct emul *emul)
@@ -48,12 +48,12 @@ static int i2c_mock_init(const struct emul *emul, const struct device *parent)
 
 	data->emul.api = &i2c_mock_api;
 	data->emul.addr = cfg->addr;
-	data->emul.parent = emul;
+	data->emul.target = emul;
 	data->i2c = parent;
 	data->cfg = cfg;
 	i2c_common_emul_init(data);
 
-	return i2c_emul_register(parent, emul->dev_label, &data->emul);
+	return 0;
 }
 
 #define INIT_I2C_MOCK(n)                                              \
@@ -64,6 +64,14 @@ static int i2c_mock_init(const struct emul *emul, const struct device *parent)
 	};                                                            \
 	static struct i2c_common_emul_data i2c_mock_data_##n;         \
 	EMUL_DEFINE(i2c_mock_init, DT_DRV_INST(n), &i2c_mock_cfg_##n, \
-		    &i2c_mock_data_##n)
+		    &i2c_mock_data_##n, &i2c_common_emul_api)
 
 DT_INST_FOREACH_STATUS_OKAY(INIT_I2C_MOCK)
+
+DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE);
+
+struct i2c_common_emul_data *
+emul_i2c_mock_get_i2c_common_data(const struct emul *emul)
+{
+	return emul->data;
+}