zephyr: emul: rename the binding to be consistent

Zephyr uses a -emul suffix on all emulation bindings. Rename some of the
EC emul bindings so that they are consistent with upstream and the other
ones we already have.

BRANCH=none
BUG=none
TEST=cq dry run

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I666b74bb243da10a79dd1d0da56028c2b142d360
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4047463
Reviewed-by: Yuval Peress <peress@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

20 files changed, 27 insertions, 27 deletions

diff --git a/zephyr/dts/bindings/emul/cros,anx7447-tcpc.yaml b/zephyr/dts/bindings/emul/cros,anx7447-tcpc-emul.yaml
index 562485d03d..a4b41a0cec 100644
--- a/zephyr/dts/bindings/emul/cros,anx7447-tcpc.yaml
+++ b/zephyr/dts/bindings/emul/cros,anx7447-tcpc-emul.yaml
@@ -4,7 +4,7 @@
 #
 description: Zephyr ANX7447 emulator
 
-compatible: "cros,anx7447-emul"
+compatible: "cros,anx7447-tcpc-emul"
 
 include: i2c-device.yaml
 
diff --git a/zephyr/dts/bindings/emul/zephyr,bma255.yaml b/zephyr/dts/bindings/emul/zephyr,bma255-emul.yaml
index 3f504e05a5..7017d62667 100644
--- a/zephyr/dts/bindings/emul/zephyr,bma255.yaml
+++ b/zephyr/dts/bindings/emul/zephyr,bma255-emul.yaml
@@ -4,7 +4,7 @@
 
 description: Zephyr BMA255 Emulator
 
-compatible: "zephyr,bma255"
+compatible: "zephyr,bma255-emul"
 
 include: base.yaml
 
diff --git a/zephyr/dts/bindings/emul/zephyr,bmi.yaml b/zephyr/dts/bindings/emul/zephyr,bmi-emul.yaml
index 6280d5cc39..b8b1d2551d 100644
--- a/zephyr/dts/bindings/emul/zephyr,bmi.yaml
+++ b/zephyr/dts/bindings/emul/zephyr,bmi-emul.yaml
@@ -4,7 +4,7 @@
 
 description: Zephyr BMI Emulator
 
-compatible: "zephyr,bmi"
+compatible: "zephyr,bmi-emul"
 
 include: base.yaml
 
diff --git a/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml b/zephyr/dts/bindings/emul/zephyr,smart-battery-emul.yaml
index 4c46fd4f64..88060b01d7 100644
--- a/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml
+++ b/zephyr/dts/bindings/emul/zephyr,smart-battery-emul.yaml
@@ -4,7 +4,7 @@
 
 description: Zephyr Smart Battery Emulator
 
-compatible: "zephyr,smart-battery"
+compatible: "zephyr,smart-battery-emul"
 
 include: base.yaml
 
diff --git a/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml b/zephyr/dts/bindings/emul/zephyr,tcs3400-emul.yaml
index f214a21064..8c33331b7a 100644
--- a/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml
+++ b/zephyr/dts/bindings/emul/zephyr,tcs3400-emul.yaml
@@ -4,7 +4,7 @@
 
 description: Zephyr ALS TCS3400 light sensor i2c emulator
 
-compatible: "zephyr,tcs3400"
+compatible: "zephyr,tcs3400-emul"
 
 include: base.yaml
 
diff --git a/zephyr/dts/bindings/emul/zephyr,tusb1064.yaml b/zephyr/dts/bindings/emul/zephyr,tusb1064-emul.yaml
index 3cab1dd5a6..3cab1dd5a6 100644
--- a/zephyr/dts/bindings/emul/zephyr,tusb1064.yaml
+++ b/zephyr/dts/bindings/emul/zephyr,tusb1064-emul.yaml
diff --git a/zephyr/emul/Kconfig b/zephyr/emul/Kconfig
index 20b2d984f9..d2a0e8b4f1 100644
--- a/zephyr/emul/Kconfig
+++ b/zephyr/emul/Kconfig
@@ -14,7 +14,7 @@ config EMUL_COMMON_I2C
 config EMUL_SMART_BATTERY
 	bool "Smart Battery emulator"
 	default y
-	depends on DT_HAS_ZEPHYR_SMART_BATTERY_ENABLED
+	depends on DT_HAS_ZEPHYR_SMART_BATTERY_EMUL_ENABLED
 	select EMUL_COMMON_I2C
 	help
 	  Enable the Smart Battery emulator. This driver use emulated I2C bus.
@@ -22,7 +22,7 @@ config EMUL_SMART_BATTERY
 config EMUL_BMA255
 	bool "BMA255 emulator"
 	default y
-	depends on DT_HAS_ZEPHYR_BMA255_ENABLED
+	depends on DT_HAS_ZEPHYR_BMA255_EMUL_ENABLED
 	select EMUL_COMMON_I2C
 	help
 	  Enable the BMA255 emulator. This driver use emulated I2C bus.
@@ -50,7 +50,7 @@ config EMUL_PPC_SYV682X
 config EMUL_BMI
 	bool "BMI emulator"
 	default y
-	depends on DT_HAS_ZEPHYR_BMI_ENABLED
+	depends on DT_HAS_ZEPHYR_BMI_EMUL_ENABLED
 	select EMUL_COMMON_I2C
 	help
 	  Enable the BMI emulator. This driver use emulated I2C bus.
@@ -60,7 +60,7 @@ config EMUL_BMI
 config EMUL_TCS3400
 	bool "TCS3400 emulator"
 	default y
-	depends on DT_HAS_ZEPHYR_TCS3400_ENABLED
+	depends on DT_HAS_ZEPHYR_TCS3400_EMUL_ENABLED
 	select EMUL_COMMON_I2C
 	help
 	  Enable the TCS3400 light sensor. This driver use emulated I2C bus.
diff --git a/zephyr/emul/emul_bma255.c b/zephyr/emul/emul_bma255.c
index c563937561..2afe1f722e 100644
--- a/zephyr/emul/emul_bma255.c
+++ b/zephyr/emul/emul_bma255.c
@@ -14,7 +14,7 @@
 #include <zephyr/drivers/i2c_emul.h>
 #include <zephyr/logging/log.h>
 
-#define DT_DRV_COMPAT zephyr_bma255
+#define DT_DRV_COMPAT zephyr_bma255_emul
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 LOG_MODULE_REGISTER(emul_bma255);
diff --git a/zephyr/emul/emul_bmi.c b/zephyr/emul/emul_bmi.c
index 99a06ec00c..d0f5691402 100644
--- a/zephyr/emul/emul_bmi.c
+++ b/zephyr/emul/emul_bmi.c
@@ -17,7 +17,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
 
-#define DT_DRV_COMPAT zephyr_bmi
+#define DT_DRV_COMPAT zephyr_bmi_emul
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 LOG_MODULE_REGISTER(emul_bmi);
diff --git a/zephyr/emul/emul_bmi160.c b/zephyr/emul/emul_bmi160.c
index 1b1991a24d..8b3042e2ff 100644
--- a/zephyr/emul/emul_bmi160.c
+++ b/zephyr/emul/emul_bmi160.c
@@ -13,7 +13,7 @@
 #include <zephyr/drivers/i2c_emul.h>
 #include <zephyr/logging/log.h>
 
-#define DT_DRV_COMPAT zephyr_bmi
+#define DT_DRV_COMPAT zephyr_bmi_emul
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 LOG_MODULE_REGISTER(emul_bmi160);
diff --git a/zephyr/emul/emul_bmi260.c b/zephyr/emul/emul_bmi260.c
index 2c93e1c2ea..d62b51ebfa 100644
--- a/zephyr/emul/emul_bmi260.c
+++ b/zephyr/emul/emul_bmi260.c
@@ -13,7 +13,7 @@
 #include <zephyr/drivers/i2c_emul.h>
 #include <zephyr/logging/log.h>
 
-#define DT_DRV_COMPAT zephyr_bmi
+#define DT_DRV_COMPAT zephyr_bmi_emul
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 LOG_MODULE_REGISTER(emul_bmi260);
diff --git a/zephyr/emul/emul_smart_battery.c b/zephyr/emul/emul_smart_battery.c
index 7ad4ba41bc..acada754d7 100644
--- a/zephyr/emul/emul_smart_battery.c
+++ b/zephyr/emul/emul_smart_battery.c
@@ -16,7 +16,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/ztest.h>
 
-#define DT_DRV_COMPAT zephyr_smart_battery
+#define DT_DRV_COMPAT zephyr_smart_battery_emul
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 LOG_MODULE_REGISTER(smart_battery);
diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c
index a9cbc2a1dc..0266fe2998 100644
--- a/zephyr/emul/emul_tcs3400.c
+++ b/zephyr/emul/emul_tcs3400.c
@@ -15,7 +15,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/ztest.h>
 
-#define DT_DRV_COMPAT zephyr_tcs3400
+#define DT_DRV_COMPAT zephyr_tcs3400_emul
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 LOG_MODULE_REGISTER(emul_tcs);
diff --git a/zephyr/emul/tcpc/Kconfig b/zephyr/emul/tcpc/Kconfig
index 6d6c8cba00..147f267113 100644
--- a/zephyr/emul/tcpc/Kconfig
+++ b/zephyr/emul/tcpc/Kconfig
@@ -24,7 +24,7 @@ source "subsys/logging/Kconfig.template.log_config"
 config EMUL_ANX7447
 	bool "Analogix ANX7447 emulator"
 	default y
-	depends on DT_HAS_CROS_ANX7447_EMUL_ENABLED
+	depends on DT_HAS_CROS_ANX7447_TCPC_EMUL_ENABLED
 	help
 	  Enable emulator for ANX7447 of TCPM. This emulator is extension for
 	  TCPCI emulator. ANX7447 specific API is available in
diff --git a/zephyr/emul/tcpc/emul_anx7447.c b/zephyr/emul/tcpc/emul_anx7447.c
index 9f92bf8ab1..fb15e2eb4e 100644
--- a/zephyr/emul/tcpc/emul_anx7447.c
+++ b/zephyr/emul/tcpc/emul_anx7447.c
@@ -15,7 +15,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/ztest.h>
 
-#define DT_DRV_COMPAT cros_anx7447_emul
+#define DT_DRV_COMPAT cros_anx7447_tcpc_emul
 
 LOG_MODULE_REGISTER(anx7447_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
diff --git a/zephyr/shim/include/usbc/tcpc_anx7447_emul.h b/zephyr/shim/include/usbc/tcpc_anx7447_emul.h
index f8ca60de6e..3367286dd9 100644
--- a/zephyr/shim/include/usbc/tcpc_anx7447_emul.h
+++ b/zephyr/shim/include/usbc/tcpc_anx7447_emul.h
@@ -7,7 +7,7 @@
 
 #include <zephyr/devicetree.h>
 
-#define ANX7447_EMUL_COMPAT cros_anx7447_emul
+#define ANX7447_EMUL_COMPAT cros_anx7447_tcpc_emul
 
 #define TCPC_CONFIG_ANX7447_EMUL(id) \
 	{                                              \
diff --git a/zephyr/test/drivers/anx7447/tcpc_policy.dts b/zephyr/test/drivers/anx7447/tcpc_policy.dts
index 9126d55e61..6bdae81e73 100644
--- a/zephyr/test/drivers/anx7447/tcpc_policy.dts
+++ b/zephyr/test/drivers/anx7447/tcpc_policy.dts
@@ -18,7 +18,7 @@
 	status="okay";
 
 	anx7447_emul: anx7447_emul@2c {
-		compatible = "cros,anx7447-emul";
+		compatible = "cros,anx7447-tcpc-emul";
 		reg = <0x2c>;
 		tcpc-flags = <(
 			TCPC_FLAGS_VBUS_MONITOR |
diff --git a/zephyr/test/drivers/boards/native_posix.overlay b/zephyr/test/drivers/boards/native_posix.overlay
index fa427c30f5..1f92686c33 100644
--- a/zephyr/test/drivers/boards/native_posix.overlay
+++ b/zephyr/test/drivers/boards/native_posix.overlay
@@ -815,7 +815,7 @@
 		reg = <0x400 4>;
 
 		tcs_emul: tcs@39 {
-			compatible = "zephyr,tcs3400";
+			compatible = "zephyr,tcs3400-emul";
 			reg = <0x39>;
 			error-on-ro-write;
 			error-on-reserved-bit-write;
@@ -823,7 +823,7 @@
 		};
 
 		accel_bmi160: bmi160@68 {
-			compatible = "zephyr,bmi";
+			compatible = "zephyr,bmi-emul";
 			reg = <0x68>;
 			device-model = "BMI_EMUL_160";
 			error-on-ro-write;
@@ -1078,7 +1078,7 @@
 	};
 
 	battery: sb@b {
-		compatible = "zephyr,smart-battery";
+		compatible = "zephyr,smart-battery-emul";
 		reg = <0xb>;
 		cycle-count = <99>;
 		version = "BATTERY_SPEC_VER_1_1_WITH_PEC";
@@ -1090,7 +1090,7 @@
 	};
 
 	battery2: sb@3a {
-		compatible = "zephyr,smart-battery";
+		compatible = "zephyr,smart-battery-emul";
 		reg = <0x3a>;
 		cycle-count = <99>;
 		version = "BATTERY_SPEC_VER_1_1_WITH_PEC";
@@ -1102,7 +1102,7 @@
 	};
 
 	bma_emul: bma@18 {
-		compatible = "zephyr,bma255";
+		compatible = "zephyr,bma255-emul";
 		reg = <0x18>;
 		error-on-compensation-not-ready;
 		error-on-ro-write;
@@ -1111,7 +1111,7 @@
 	};
 
 	accel_bmi260: bmi260@68 {
-		compatible = "zephyr,bmi";
+		compatible = "zephyr,bmi-emul";
 		reg = <0x68>;
 		device-model = "BMI_EMUL_260";
 		error-on-ro-write;
diff --git a/zephyr/test/krabby/common.dts b/zephyr/test/krabby/common.dts
index 8f7c6c114d..9e94392561 100644
--- a/zephyr/test/krabby/common.dts
+++ b/zephyr/test/krabby/common.dts
@@ -105,7 +105,7 @@
 	};
 
 	battery: sb@b {
-		compatible = "zephyr,smart-battery";
+		compatible = "zephyr,smart-battery-emul";
 		reg = <0xb>;
 		cycle-count = <99>;
 		version = "BATTERY_SPEC_VER_1_1_WITH_PEC";
diff --git a/zephyr/test/vboot_efs2/boards/native_posix.overlay b/zephyr/test/vboot_efs2/boards/native_posix.overlay
index fa6d46e135..83b9e9b365 100644
--- a/zephyr/test/vboot_efs2/boards/native_posix.overlay
+++ b/zephyr/test/vboot_efs2/boards/native_posix.overlay
@@ -126,7 +126,7 @@
 
 &i2c0 {
 	battery: sb@b {
-		compatible = "zephyr,smart-battery";
+		compatible = "zephyr,smart-battery-emul";
 		reg = <0xb>;
 		cycle-count = <99>;
 		version = "BATTERY_SPEC_VER_1_1_WITH_PEC";