zephyr: Remove label usage from ln9310 emulator

Remove all devcietree label references from the ln9310 emulator.

BUG=b:239165779
BRANCH=none
TEST=./twister --clobber

Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: Id56fe974d4f18b32fcd47f9e0a2c4b69412fb827
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3855420
Reviewed-by: Yuval Peress <peress@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

4 files changed, 19 insertions, 40 deletions

diff --git a/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml b/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml
index ba9c22a15c..2665dd4207 100644
--- a/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml
+++ b/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml
@@ -6,11 +6,7 @@ description: Cros LN9310 Emulator
 
 compatible: "cros,ln9310-emul"
 
-# TODO(b/239165779): Reduce or remove the usage of label properties
-include:
-  - name: base.yaml
-    property-blocklist:
-      - label
+include: base.yaml
 
 properties:
   reg:
@@ -20,6 +16,3 @@ properties:
     description:
       GPIO that receives interrupt signal from this device.
     required: true
-  label:
-      type: string
-      required: false
diff --git a/zephyr/emul/emul_ln9310.c b/zephyr/emul/emul_ln9310.c
index 2218c03012..f6ffbf2b33 100644
--- a/zephyr/emul/emul_ln9310.c
+++ b/zephyr/emul/emul_ln9310.c
@@ -500,7 +500,7 @@ static int emul_ln9310_init(const struct emul *emul,
 		.gpio_int_pin = LN9310_GET_GPIO_INT_PIN(n),		       \
 	}; \
 	static const struct i2c_common_emul_cfg ln9310_emul_cfg_##n = {          \
-		.dev_label = DT_INST_LABEL(n),                                   \
+		.dev_label = DT_NODE_FULL_NAME(DT_DRV_INST(n)),                  \
 		.addr = DT_INST_REG_ADDR(n),                                     \
 	};                                                                       \
 	EMUL_DT_INST_DEFINE(n, emul_ln9310_init, &ln9310_emul_data_##n,          \
diff --git a/zephyr/test/drivers/boards/native_posix.overlay b/zephyr/test/drivers/boards/native_posix.overlay
index f838a37d8c..988216b694 100644
--- a/zephyr/test/drivers/boards/native_posix.overlay
+++ b/zephyr/test/drivers/boards/native_posix.overlay
@@ -921,7 +921,6 @@
 		compatible = "cros,ln9310-emul";
 		status = "okay";
 		reg = <0x72>;
-		label = "LN9310";
 		pg-int-pin = <&gpio_switchcap_pg_int_l>;
 	};
 
diff --git a/zephyr/test/drivers/default/src/ln9310.c b/zephyr/test/drivers/default/src/ln9310.c
index 0d40767740..45d6ebaba1 100644
--- a/zephyr/test/drivers/default/src/ln9310.c
+++ b/zephyr/test/drivers/default/src/ln9310.c
@@ -21,6 +21,8 @@
  */
 #define TEST_DELAY_MS 50
 
+#define EMUL_LN9310_NODE DT_NODELABEL(ln9310)
+
 /*
  * Chip revisions below LN9310_BC_STS_C_CHIP_REV_FIXED require an alternative
  * software startup to properly initialize and power up.
@@ -30,8 +32,7 @@
 
 ZTEST(ln9310, test_ln9310_read_chip_fails)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 
@@ -58,8 +59,7 @@ ZTEST(ln9310, test_ln9310_read_chip_fails)
 
 ZTEST(ln9310, test_ln9310_2s_powers_up)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 
 	zassert_not_null(emulator, NULL);
 
@@ -83,8 +83,7 @@ ZTEST(ln9310, test_ln9310_2s_powers_up)
 
 ZTEST(ln9310, test_ln9310_3s_powers_up)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 
 	zassert_not_null(emulator, NULL);
 
@@ -134,8 +133,7 @@ static int mock_write_fn_intercept_startup_workaround(const struct emul *emul,
 
 ZTEST(ln9310, test_ln9310_2s_cfly_precharge_startup)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 
@@ -181,8 +179,7 @@ ZTEST(ln9310, test_ln9310_2s_cfly_precharge_startup)
 
 ZTEST(ln9310, test_ln9310_3s_cfly_precharge_startup)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 
@@ -228,8 +225,7 @@ ZTEST(ln9310, test_ln9310_3s_cfly_precharge_startup)
 
 ZTEST(ln9310, test_ln9310_cfly_precharge_exceeds_retries)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 
@@ -273,8 +269,7 @@ ZTEST(ln9310, test_ln9310_cfly_precharge_exceeds_retries)
 
 ZTEST(ln9310, test_ln9310_battery_unknown)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 
 	zassert_not_null(emulator, NULL);
 
@@ -303,8 +298,7 @@ ZTEST(ln9310, test_ln9310_battery_unknown)
 
 ZTEST(ln9310, test_ln9310_2s_battery_read_fails)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 
@@ -339,8 +333,7 @@ ZTEST(ln9310, test_ln9310_2s_battery_read_fails)
 
 ZTEST(ln9310, test_ln9310_lion_ctrl_reg_fails)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 
@@ -400,8 +393,7 @@ static int mock_intercept_startup_ctrl_reg(const struct emul *emulator, int reg,
 
 ZTEST(ln9310, test_ln9310_cfly_precharge_timesout)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 	struct precharge_timeout_data test_data = {
@@ -464,8 +456,7 @@ static int mock_read_intercept_reg_to_fail(const struct emul *emul, int reg,
 
 ZTEST(ln9310, test_ln9310_interrupt_reg_fail)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 	struct reg_to_fail_data test_data = {
@@ -512,8 +503,7 @@ ZTEST(ln9310, test_ln9310_interrupt_reg_fail)
 
 ZTEST(ln9310, test_ln9310_sys_sts_reg_fail)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 	struct reg_to_fail_data test_data = {
@@ -570,8 +560,7 @@ static int mock_read_interceptor(const struct emul *emul, int reg, uint8_t *val,
 
 ZTEST(ln9310, test_ln9310_reset_explicit_detected_startup)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 	struct reg_to_intercept test_data = {
@@ -605,8 +594,7 @@ ZTEST(ln9310, test_ln9310_reset_explicit_detected_startup)
 
 ZTEST(ln9310, test_ln9310_update_startup_seq_fails)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 	struct reg_to_fail_data test_data = {
@@ -643,8 +631,7 @@ ZTEST(ln9310, test_ln9310_update_startup_seq_fails)
 
 ZTEST(ln9310, test_ln9310_state_change_only_on_mode_change_interrupt)
 {
-	const struct emul *emulator =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(ln9310)));
+	const struct emul *emulator = EMUL_DT_GET(EMUL_LN9310_NODE);
 	struct i2c_common_emul_data *common_data =
 		emul_ln9310_get_i2c_common_data(emulator);
 	struct reg_to_intercept test_data = {