Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-releasefirmware-fpmcu-dartmonkey-release

Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file
./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release

Relevant changes:

git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh

ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
a0751778f4 board/nocturne_fp/ro_workarounds.c: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
58f0246dbe board/nocturne_fp/board_ro.c: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
84e53a65da board/nocturne_fp/board.h: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header

BRANCH=None
BUG=b:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
     Test "aes": PASSED
     Test "cec": PASSED
     Test "cortexm_fpu": PASSED
     Test "crc": PASSED
     Test "flash_physical": PASSED
     Test "flash_write_protect": PASSED
     Test "fpsensor_hw": PASSED
     Test "fpsensor_spi_ro": PASSED
     Test "fpsensor_spi_rw": PASSED
     Test "fpsensor_uart_ro": PASSED
     Test "fpsensor_uart_rw": PASSED
     Test "mpu_ro": PASSED
     Test "mpu_rw": PASSED
     Test "mutex": PASSED
     Test "pingpong": PASSED
     Test "printf": PASSED
     Test "queue": PASSED
     Test "rollback_region0": PASSED
     Test "rollback_region1": PASSED
     Test "rollback_entropy": PASSED
     Test "rtc": PASSED
     Test "sha256": PASSED
     Test "sha256_unrolled": PASSED
     Test "static_if": PASSED
     Test "stdlib": PASSED
     Test "system_is_locked_wp_on": PASSED
     Test "system_is_locked_wp_off": PASSED
     Test "timer_dos": PASSED
     Test "utils": PASSED
     Test "utils_str": PASSED
     Test "panic_data_dartmonkey_v2.0.2887": PASSED
     Test "panic_data_nocturne_fp_v2.2.64": PASSED
     Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>

Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7

1 files changed, 119 insertions, 135 deletions

diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c
index 15a1bbe9c7..e87deebc35 100644
--- a/zephyr/emul/emul_tcs3400.c
+++ b/zephyr/emul/emul_tcs3400.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -13,17 +13,14 @@ LOG_MODULE_REGISTER(emul_tcs);
 #include <zephyr/drivers/emul.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/i2c_emul.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_tcs3400.h"
+#include "emul/emul_stub_device.h"
 
 #include "driver/als_tcs3400.h"
 
-#define TCS_DATA_FROM_I2C_EMUL(_emul)					     \
-	CONTAINER_OF(CONTAINER_OF(_emul, struct i2c_common_emul_data, emul), \
-		     struct tcs_emul_data, common)
-
 /** Run-time data used by the emulator */
 struct tcs_emul_data {
 	/** Common I2C data */
@@ -64,7 +61,7 @@ struct tcs_emul_data {
 };
 
 /** Check description in emul_tcs3400.h */
-void tcs_emul_set_reg(struct i2c_emul *emul, int reg, uint8_t val)
+void tcs_emul_set_reg(const struct emul *emul, int reg, uint8_t val)
 {
 	struct tcs_emul_data *data;
 
@@ -73,12 +70,12 @@ void tcs_emul_set_reg(struct i2c_emul *emul, int reg, uint8_t val)
 	}
 
 	reg -= TCS_EMUL_FIRST_REG;
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 	data->reg[reg] = val;
 }
 
 /** Check description in emul_tcs3400.h */
-uint8_t tcs_emul_get_reg(struct i2c_emul *emul, int reg)
+uint8_t tcs_emul_get_reg(const struct emul *emul, int reg)
 {
 	struct tcs_emul_data *data;
 
@@ -86,18 +83,18 @@ uint8_t tcs_emul_get_reg(struct i2c_emul *emul, int reg)
 		return 0;
 	}
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 	reg -= TCS_EMUL_FIRST_REG;
 
 	return data->reg[reg];
 }
 
 /** Check description in emul_tcs3400.h */
-int tcs_emul_get_val(struct i2c_emul *emul, enum tcs_emul_axis axis)
+int tcs_emul_get_val(const struct emul *emul, enum tcs_emul_axis axis)
 {
 	struct tcs_emul_data *data;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 
 	switch (axis) {
 	case TCS_EMUL_R:
@@ -116,11 +113,11 @@ int tcs_emul_get_val(struct i2c_emul *emul, enum tcs_emul_axis axis)
 }
 
 /** Check description in emul_tcs3400.h */
-void tcs_emul_set_val(struct i2c_emul *emul, enum tcs_emul_axis axis, int val)
+void tcs_emul_set_val(const struct emul *emul, enum tcs_emul_axis axis, int val)
 {
 	struct tcs_emul_data *data;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 
 	switch (axis) {
 	case TCS_EMUL_R:
@@ -142,59 +139,59 @@ void tcs_emul_set_val(struct i2c_emul *emul, enum tcs_emul_axis axis, int val)
 }
 
 /** Check description in emul_tcs3400.h */
-void tcs_emul_set_err_on_ro_write(struct i2c_emul *emul, bool set)
+void tcs_emul_set_err_on_ro_write(const struct emul *emul, bool set)
 {
 	struct tcs_emul_data *data;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 	data->error_on_ro_write = set;
 }
 
 /** Check description in emul_tcs3400.h */
-void tcs_emul_set_err_on_rsvd_write(struct i2c_emul *emul, bool set)
+void tcs_emul_set_err_on_rsvd_write(const struct emul *emul, bool set)
 {
 	struct tcs_emul_data *data;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 	data->error_on_rsvd_write = set;
 }
 
 /** Check description in emul_tcs3400.h */
-void tcs_emul_set_err_on_msb_first(struct i2c_emul *emul, bool set)
+void tcs_emul_set_err_on_msb_first(const struct emul *emul, bool set)
 {
 	struct tcs_emul_data *data;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 	data->error_on_msb_first = set;
 }
 
 /** Mask reserved bits in registers of TCS3400 */
 static const uint8_t tcs_emul_rsvd_mask[] = {
-	[TCS_I2C_ENABLE  - TCS_EMUL_FIRST_REG]	= 0xa4,
-	[TCS_I2C_ATIME   - TCS_EMUL_FIRST_REG]	= 0x00,
-	[0x2]					= 0xff, /* Reserved */
-	[TCS_I2C_WTIME   - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_AILTL   - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_AILTH   - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_AIHTL   - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_AIHTH   - TCS_EMUL_FIRST_REG]	= 0x00,
-	[0x8 ... 0xb]				= 0xff, /* Reserved */
-	[TCS_I2C_PERS    - TCS_EMUL_FIRST_REG]	= 0xf0,
-	[TCS_I2C_CONFIG  - TCS_EMUL_FIRST_REG]	= 0x81,
-	[0xe]					= 0xff, /* Reserved */
-	[TCS_I2C_CONTROL - TCS_EMUL_FIRST_REG]	= 0xfc,
-	[TCS_I2C_AUX     - TCS_EMUL_FIRST_REG]	= 0xdf,
-	[TCS_I2C_REVID   - TCS_EMUL_FIRST_REG]	= 0xf0,
-	[TCS_I2C_ID      - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_STATUS  - TCS_EMUL_FIRST_REG]	= 0x6e,
-	[TCS_I2C_CDATAL  - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_CDATAH  - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_RDATAL  - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_RDATAH  - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_GDATAL  - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_GDATAH  - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_BDATAL  - TCS_EMUL_FIRST_REG]	= 0x00,
-	[TCS_I2C_BDATAH  - TCS_EMUL_FIRST_REG]	= 0x00,
+	[TCS_I2C_ENABLE - TCS_EMUL_FIRST_REG] = 0xa4,
+	[TCS_I2C_ATIME - TCS_EMUL_FIRST_REG] = 0x00,
+	[0x2] = 0xff, /* Reserved */
+	[TCS_I2C_WTIME - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_AILTL - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_AILTH - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_AIHTL - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_AIHTH - TCS_EMUL_FIRST_REG] = 0x00,
+	[0x8 ... 0xb] = 0xff, /* Reserved */
+	[TCS_I2C_PERS - TCS_EMUL_FIRST_REG] = 0xf0,
+	[TCS_I2C_CONFIG - TCS_EMUL_FIRST_REG] = 0x81,
+	[0xe] = 0xff, /* Reserved */
+	[TCS_I2C_CONTROL - TCS_EMUL_FIRST_REG] = 0xfc,
+	[TCS_I2C_AUX - TCS_EMUL_FIRST_REG] = 0xdf,
+	[TCS_I2C_REVID - TCS_EMUL_FIRST_REG] = 0xf0,
+	[TCS_I2C_ID - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_STATUS - TCS_EMUL_FIRST_REG] = 0x6e,
+	[TCS_I2C_CDATAL - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_CDATAH - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_RDATAL - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_RDATAH - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_GDATAL - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_GDATAH - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_BDATAL - TCS_EMUL_FIRST_REG] = 0x00,
+	[TCS_I2C_BDATAH - TCS_EMUL_FIRST_REG] = 0x00,
 };
 
 /**
@@ -202,34 +199,34 @@ static const uint8_t tcs_emul_rsvd_mask[] = {
  *
  * @param emul Pointer to TCS3400 emulator
  */
-static void tcs_emul_reset(struct i2c_emul *emul)
+static void tcs_emul_reset(const struct emul *emul)
 {
 	struct tcs_emul_data *data;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
-
-	data->reg[TCS_I2C_ENABLE  - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_ATIME   - TCS_EMUL_FIRST_REG] = 0xff;
-	data->reg[TCS_I2C_WTIME   - TCS_EMUL_FIRST_REG] = 0xff;
-	data->reg[TCS_I2C_AILTL   - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_AILTH   - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_AIHTL   - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_AIHTH   - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_PERS    - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_CONFIG  - TCS_EMUL_FIRST_REG] = 0x40;
+	data = emul->data;
+
+	data->reg[TCS_I2C_ENABLE - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_ATIME - TCS_EMUL_FIRST_REG] = 0xff;
+	data->reg[TCS_I2C_WTIME - TCS_EMUL_FIRST_REG] = 0xff;
+	data->reg[TCS_I2C_AILTL - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_AILTH - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_AIHTL - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_AIHTH - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_PERS - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_CONFIG - TCS_EMUL_FIRST_REG] = 0x40;
 	data->reg[TCS_I2C_CONTROL - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_AUX     - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_REVID   - TCS_EMUL_FIRST_REG] = data->revision;
-	data->reg[TCS_I2C_ID      - TCS_EMUL_FIRST_REG] = data->id;
-	data->reg[TCS_I2C_STATUS  - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_CDATAL  - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_CDATAH  - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_RDATAL  - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_RDATAH  - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_GDATAL  - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_GDATAH  - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_BDATAL  - TCS_EMUL_FIRST_REG] = 0x00;
-	data->reg[TCS_I2C_BDATAH  - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_AUX - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_REVID - TCS_EMUL_FIRST_REG] = data->revision;
+	data->reg[TCS_I2C_ID - TCS_EMUL_FIRST_REG] = data->id;
+	data->reg[TCS_I2C_STATUS - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_CDATAL - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_CDATAH - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_RDATAL - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_RDATAH - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_GDATAL - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_GDATAH - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_BDATAL - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_BDATAH - TCS_EMUL_FIRST_REG] = 0x00;
 
 	data->ir_select = false;
 }
@@ -274,13 +271,13 @@ static int tcs_emul_get_cycles(uint8_t atime)
  *
  * @param emul Pointer to TCS3400 emulator
  */
-static void tcs_emul_clear_int(struct i2c_emul *emul)
+static void tcs_emul_clear_int(const struct emul *emul)
 {
 	struct tcs_emul_data *data;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 
-	data->reg[TCS_I2C_STATUS  - TCS_EMUL_FIRST_REG] = 0x00;
+	data->reg[TCS_I2C_STATUS - TCS_EMUL_FIRST_REG] = 0x00;
 }
 
 /**
@@ -296,12 +293,12 @@ static void tcs_emul_clear_int(struct i2c_emul *emul)
  * @return 0 on success
  * @return -EIO on error
  */
-static int tcs_emul_handle_write(struct i2c_emul *emul, int reg, int bytes)
+static int tcs_emul_handle_write(const struct emul *emul, int reg, int bytes)
 {
 	struct tcs_emul_data *data;
 	uint8_t val;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 
 	/* This write only selected register for I2C read message */
 	if (bytes < 2) {
@@ -388,7 +385,7 @@ static int tcs_emul_handle_write(struct i2c_emul *emul, int reg, int bytes)
  * @return 0 on success
  * @return -EIO when accessing MSB before LSB
  */
-static int tcs_emul_get_reg_val(struct i2c_emul *emul, int reg,
+static int tcs_emul_get_reg_val(const struct emul *emul, int reg,
 				bool *lsb_read, bool lsb, unsigned int val)
 {
 	struct tcs_emul_data *data;
@@ -398,7 +395,7 @@ static int tcs_emul_get_reg_val(struct i2c_emul *emul, int reg,
 	int cycles;
 	int gain;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 
 	if (lsb) {
 		*lsb_read = 1;
@@ -418,10 +415,10 @@ static int tcs_emul_get_reg_val(struct i2c_emul *emul, int reg,
 	lsb_reg = (reg - TCS_EMUL_FIRST_REG) & ~(0x1);
 	msb_reg = (reg - TCS_EMUL_FIRST_REG) | 0x1;
 
-	gain = tcs_emul_get_gain(data->reg[TCS_I2C_CONTROL -
-					   TCS_EMUL_FIRST_REG]);
-	cycles = tcs_emul_get_cycles(data->reg[TCS_I2C_ATIME -
-					       TCS_EMUL_FIRST_REG]);
+	gain = tcs_emul_get_gain(
+		data->reg[TCS_I2C_CONTROL - TCS_EMUL_FIRST_REG]);
+	cycles = tcs_emul_get_cycles(
+		data->reg[TCS_I2C_ATIME - TCS_EMUL_FIRST_REG]);
 	/*
 	 * Internal value is with 256 cycles and x64 gain, so divide it to get
 	 * registers value
@@ -452,14 +449,14 @@ static int tcs_emul_get_reg_val(struct i2c_emul *emul, int reg,
  * @return 0 on success
  * @return -EIO on error
  */
-static int tcs_emul_handle_read(struct i2c_emul *emul, int reg, uint8_t *buf,
+static int tcs_emul_handle_read(const struct emul *emul, int reg, uint8_t *buf,
 				int bytes)
 {
 	struct tcs_emul_data *data;
 	unsigned int c_ir;
 	int ret;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 
 	reg += bytes;
 
@@ -487,12 +484,12 @@ static int tcs_emul_handle_read(struct i2c_emul *emul, int reg, uint8_t *buf,
 		break;
 	case TCS_I2C_RDATAL:
 		/* Shouldn't fail for LSB */
-		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_r_read,
-					   true, data->red);
+		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_r_read, true,
+					   data->red);
 		break;
 	case TCS_I2C_RDATAH:
-		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_r_read,
-					   false, data->red);
+		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_r_read, false,
+					   data->red);
 		if (ret) {
 			LOG_ERR("MSB R read before LSB R");
 			return -EIO;
@@ -500,12 +497,12 @@ static int tcs_emul_handle_read(struct i2c_emul *emul, int reg, uint8_t *buf,
 		break;
 	case TCS_I2C_GDATAL:
 		/* Shouldn't fail for LSB */
-		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_g_read,
-					   true, data->green);
+		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_g_read, true,
+					   data->green);
 		break;
 	case TCS_I2C_GDATAH:
-		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_g_read,
-					   false, data->green);
+		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_g_read, false,
+					   data->green);
 		if (ret) {
 			LOG_ERR("MSB G read before LSB G");
 			return -EIO;
@@ -513,12 +510,12 @@ static int tcs_emul_handle_read(struct i2c_emul *emul, int reg, uint8_t *buf,
 		break;
 	case TCS_I2C_BDATAL:
 		/* Shouldn't fail for LSB */
-		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_b_read,
-					   true, data->blue);
+		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_b_read, true,
+					   data->blue);
 		break;
 	case TCS_I2C_BDATAH:
-		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_b_read,
-					   false, data->blue);
+		ret = tcs_emul_get_reg_val(emul, reg, &data->lsb_b_read, false,
+					   data->blue);
 		if (ret) {
 			LOG_ERR("MSB B read before LSB B");
 			return -EIO;
@@ -547,12 +544,12 @@ static int tcs_emul_handle_read(struct i2c_emul *emul, int reg, uint8_t *buf,
  * @return 0 on success
  * @return -EIO on error
  */
-static int tcs_emul_write_byte(struct i2c_emul *emul, int reg, uint8_t val,
+static int tcs_emul_write_byte(const struct emul *emul, int reg, uint8_t val,
 			       int bytes)
 {
 	struct tcs_emul_data *data;
 
-	data = TCS_DATA_FROM_I2C_EMUL(emul);
+	data = emul->data;
 
 	if (bytes > 1) {
 		LOG_ERR("Too long write command");
@@ -577,27 +574,20 @@ static int tcs_emul_write_byte(struct i2c_emul *emul, int reg, uint8_t val,
  *
  * @return 0 indicating success (always)
  */
-static int tcs_emul_init(const struct emul *emul,
-			 const struct device *parent)
+static int tcs_emul_init(const struct emul *emul, const struct device *parent)
 {
-	const struct i2c_common_emul_cfg *cfg = emul->cfg;
-	struct i2c_common_emul_data *data = cfg->data;
-	int ret;
+	struct tcs_emul_data *data = emul->data;
 
-	data->emul.api = &i2c_common_emul_api;
-	data->emul.addr = cfg->addr;
-	data->i2c = parent;
-	data->cfg = cfg;
-	i2c_common_emul_init(data);
+	data->common.i2c = parent;
 
-	ret = i2c_emul_register(parent, emul->dev_label, &data->emul);
+	i2c_common_emul_init(&data->common);
 
-	tcs_emul_reset(&data->emul);
+	tcs_emul_reset(emul);
 
-	return ret;
+	return 0;
 }
 
-#define TCS3400_EMUL(n)							\
+#define TCS3400_EMUL(n)                                              \
 	static struct tcs_emul_data tcs_emul_data_##n = {		\
 		.revision = DT_INST_PROP(n, revision),			\
 		.id = DT_STRING_TOKEN(DT_DRV_INST(n), device_id),		\
@@ -619,36 +609,22 @@ static int tcs_emul_init(const struct emul *emul,
 			.finish_read = NULL,				\
 			.access_reg = NULL,				\
 		},							\
-	};								\
-									\
-	static const struct i2c_common_emul_cfg tcs_emul_cfg_##n = {	\
-		.i2c_label = DT_INST_BUS_LABEL(n),			\
-		.dev_label = DT_INST_LABEL(n),                          \
-		.data = &tcs_emul_data_##n.common,			\
-		.addr = DT_INST_REG_ADDR(n),				\
-	};								\
-	EMUL_DEFINE(tcs_emul_init, DT_DRV_INST(n), &tcs_emul_cfg_##n,	\
-		    &tcs_emul_data_##n)
+	};         \
+                                                                     \
+	static const struct i2c_common_emul_cfg tcs_emul_cfg_##n = { \
+		.dev_label = DT_NODE_FULL_NAME(DT_DRV_INST(n)),      \
+		.data = &tcs_emul_data_##n.common,                   \
+		.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)
 
 DT_INST_FOREACH_STATUS_OKAY(TCS3400_EMUL)
 
-#define TCS3400_EMUL_CASE(n)					\
-	case DT_INST_DEP_ORD(n): return &tcs_emul_data_##n.common.emul;
-
-/** Check description in emul_tcs3400.h */
-struct i2c_emul *tcs_emul_get(int ord)
-{
-	switch (ord) {
-	DT_INST_FOREACH_STATUS_OKAY(TCS3400_EMUL_CASE)
-
-	default:
-		return NULL;
-	}
-}
-
 #ifdef CONFIG_ZTEST_NEW_API
 #define TCS3400_EMUL_RESET_RULE_BEFORE(n) \
-	tcs_emul_reset(&(tcs_emul_data_##n.common.emul));
+	tcs_emul_reset(EMUL_DT_GET(DT_DRV_INST(n)));
+
 static void emul_tcs3400_reset_rule_before(const struct ztest_unit_test *test,
 					   void *data)
 {
@@ -658,3 +634,11 @@ static void emul_tcs3400_reset_rule_before(const struct ztest_unit_test *test,
 }
 ZTEST_RULE(emul_tcs3400_reset, emul_tcs3400_reset_rule_before, NULL);
 #endif /* CONFIG_ZTEST_NEW_API */
+
+DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE);
+
+struct i2c_common_emul_data *
+emul_tcs3400_get_i2c_common_data(const struct emul *emul)
+{
+	return emul->data;
+}