zephyr: motionsense: drop few label properties

Drop label property from motionsensor bindings, replace it with the node
name where it was used.

BRANCH=none
BUG=b:239165779
TEST=zmake testall

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: Ie28a25feafd4e063e0c9bd90a4a2be1b815e181d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3763914
Reviewed-by: Aaron Massey <aaronmassey@google.com>

19 files changed, 22 insertions, 202 deletions

diff --git a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml
index c988af258d..71413ffd26 100644
--- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml
+++ b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml
@@ -9,14 +9,6 @@ child-binding:
   description: A mutex node is used to create an instance of mutex_t.
                A mutex node is referenced by one or more sensor nodes in
                "/motionsense-sensors" node.
-  properties:
-    label:
-      required: true
-      type: string
-      description: Human readable string describing the mutex.
-                   This is a brief explanation about the mutex.
-                   The property is not actually used in code.
-
 
 #
 # examples:
@@ -24,11 +16,9 @@ child-binding:
 # motionsense-mutex {
 #         compatible = "cros-ec,motionsense-mutex";
 #         mutex_bma255: bma255-mutex {
-#                 label = "BMA255_MUTEX";
 #         };
 #
 #         mutex_bmi260: bmi260-mutex {
-#                 label = "BMI260_MUTEX";
 #         };
 # };
 #
diff --git a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml
index 68cdd15637..35e0242348 100644
--- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml
+++ b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml
@@ -26,17 +26,10 @@ child-binding:
     and it is used to indicate one of the 4 configurations.
     For example, node name ec-s0 is for SENSOR_CONFIG_EC_S0.
     ec-s0 {
-       label = "SENSOR_CONFIG_EC_S0";
        odr = <1000>;
        ec_rate = <1000>;
     };
   properties:
-    label:
-      type: string
-      required: false
-      description: |
-        Human-readable string describing the config.
-        see the example the above.
     odr:
       type: int
       required: false
@@ -55,11 +48,9 @@ child-binding:
 #         compatible =
 #                 "cros-ec,motionsense-sensor-config";
 #         ec-s0 {
-#                 label = "SENSOR_CONFIG_EC_S0";
 #                 odr = <(10000 | ROUND_UP_FLAG)>;
 #         };
 #         ec-s3 {
-#                 label = "SENSOR_CONFIG_EC_S3";
 #                 odr = <(10000 | ROUND_UP_FLAG)>;
 #         };
 # };
diff --git a/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml b/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml
index 9e4aa8e3f7..4b60ec7288 100644
--- a/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml
+++ b/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml
@@ -9,13 +9,6 @@ include: base.yaml
 properties:
   status:
     required: true
-  label:
-    type: string
-    required: true
-    description: |
-        Human readable string describing the motion sensor.
-        This is used as the name of the motion sensor.
-        e.g) label = "Lid Accel";
   active-mask:
     type: string
     description: indicates system power state for sensor to be active
@@ -73,7 +66,6 @@ properties:
 #           compatible = "cros-ec,bma255";
 #           status = "okay";
 #
-#           label = "Lid Accel";
 #           active-mask = "SENSOR_ACTIVE_S0_S3";
 #           location = "MOTIONSENSE_LOC_LID";
 #           mutex = <&mutex_bma255>;
diff --git a/zephyr/projects/brya/motionsense.dts b/zephyr/projects/brya/motionsense.dts
index dd3f479042..2888e7082a 100644
--- a/zephyr/projects/brya/motionsense.dts
+++ b/zephyr/projects/brya/motionsense.dts
@@ -29,11 +29,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		mutex_lis2dw12: lis2dw12-mutex {
-			label = "LIS2DW12_MUTEX";
 		};
 
 		mutex_lsm6dso: lsm6dso-mutex {
-			label = "LSM6DSO_MUTEX";
 		};
 	};
 
@@ -139,7 +137,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 */
 	motionsense-sensor {
@@ -147,7 +145,6 @@
 			compatible = "cros-ec,lis2dw12";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&mutex_lis2dw12>;
@@ -160,11 +157,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -174,7 +169,6 @@
 			compatible = "cros-ec,lsm6dso-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_lsm6dso>;
@@ -187,12 +181,10 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(13000 | ROUND_UP_FLAG)>;
 					ec-rate = <(100 * USEC_PER_MSEC)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 					ec-rate = <(100 * USEC_PER_MSEC)>;
 				};
@@ -203,7 +195,6 @@
 			compatible = "cros-ec,lsm6dso-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_lsm6dso>;
@@ -218,7 +209,6 @@
 			compatible = "cros-ec,tcs3400-clear";
 			status = "okay";
 
-			label = "Clear Light";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_CAMERA";
 			port = <&i2c_sensor>;
@@ -230,7 +220,6 @@
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
 					/* Run ALS sensor in S0 */
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <1000>;
 				};
 			};
@@ -240,7 +229,6 @@
 			compatible = "cros-ec,tcs3400-rgb";
 			status = "okay";
 
-			label = "RGB Light";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_CAMERA";
 			default-range = <0x10000>; /* scale = 1x, uscale = 0 */
diff --git a/zephyr/projects/corsola/motionsense_kingler.dts b/zephyr/projects/corsola/motionsense_kingler.dts
index 4667635da0..354eb88c6b 100644
--- a/zephyr/projects/corsola/motionsense_kingler.dts
+++ b/zephyr/projects/corsola/motionsense_kingler.dts
@@ -29,10 +29,8 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 		base_mutex: base-mutex {
-			label = "BASE_MUTEX";
 		};
 	};
 
@@ -73,7 +71,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 */
 	motionsense-sensor {
@@ -81,7 +79,6 @@
 			compatible = "cros-ec,bma4xx";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -93,11 +90,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(12500 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(12500 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -107,7 +102,6 @@
 			compatible = "cros-ec,bmi3xx-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
@@ -118,12 +112,10 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(12500 | ROUND_UP_FLAG)>;
 					ec-rate = <(100 * USEC_PER_MSEC)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(12500 | ROUND_UP_FLAG)>;
 					ec-rate = <0>;
 				};
@@ -134,7 +126,6 @@
 			compatible = "cros-ec,bmi3xx-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
diff --git a/zephyr/projects/corsola/motionsense_krabby.dts b/zephyr/projects/corsola/motionsense_krabby.dts
index d369db460a..1a09b5ae40 100644
--- a/zephyr/projects/corsola/motionsense_krabby.dts
+++ b/zephyr/projects/corsola/motionsense_krabby.dts
@@ -27,11 +27,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		base_mutex: icm42607-mutex {
-			label = "ICM42607_MUTEX";
 		};
 	};
 
@@ -74,7 +72,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 */
 	motionsense-sensor {
@@ -82,7 +80,6 @@
 			compatible = "cros-ec,lis2dw12";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -94,11 +91,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -108,7 +103,6 @@
 			compatible = "cros-ec,icm42607-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
@@ -119,11 +113,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -133,7 +125,6 @@
 			compatible = "cros-ec,icm42607-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
diff --git a/zephyr/projects/herobrine/motionsense.dts b/zephyr/projects/herobrine/motionsense.dts
index 1d36fcbf47..ee55fa4afd 100644
--- a/zephyr/projects/herobrine/motionsense.dts
+++ b/zephyr/projects/herobrine/motionsense.dts
@@ -27,11 +27,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		mutex_bmi260: bmi260-mutex {
-			label = "BMI260_MUTEX";
 		};
 	};
 
@@ -134,7 +132,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 */
 	motionsense-sensor {
@@ -142,7 +140,6 @@
 			compatible = "cros-ec,bma255";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -155,11 +152,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -169,7 +164,6 @@
 			compatible = "cros-ec,bmi260-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi260>;
@@ -180,11 +174,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -194,7 +186,6 @@
 			compatible = "cros-ec,bmi260-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi260>;
@@ -207,7 +198,6 @@
 			compatible = "cros-ec,tcs3400-clear";
 			status = "okay";
 
-			label = "Clear Light";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_CAMERA";
 			port = <&i2c_sensor>;
@@ -219,7 +209,6 @@
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
 					/* Run ALS sensor in S0 */
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <1000>;
 				};
 			};
@@ -229,7 +218,6 @@
 			compatible = "cros-ec,tcs3400-rgb";
 			status = "okay";
 
-			label = "RGB Light";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_CAMERA";
 			default-range = <0x10000>; /* scale = 1x, uscale = 0 */
diff --git a/zephyr/projects/herobrine/motionsense_hoglin.dts b/zephyr/projects/herobrine/motionsense_hoglin.dts
index 3f67347e10..17a0f0f37f 100644
--- a/zephyr/projects/herobrine/motionsense_hoglin.dts
+++ b/zephyr/projects/herobrine/motionsense_hoglin.dts
@@ -27,11 +27,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		mutex_bmi260: bmi260-mutex {
-			label = "BMI260_MUTEX";
 		};
 	};
 
@@ -134,7 +132,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 */
 	motionsense-sensor {
@@ -142,7 +140,6 @@
 			compatible = "cros-ec,bma4xx";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -155,11 +152,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -169,7 +164,6 @@
 			compatible = "cros-ec,bmi260-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi260>;
@@ -180,11 +174,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -194,7 +186,6 @@
 			compatible = "cros-ec,bmi260-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi260>;
@@ -207,7 +198,6 @@
 			compatible = "cros-ec,tcs3400-clear";
 			status = "okay";
 
-			label = "Clear Light";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_CAMERA";
 			port = <&i2c_sensor>;
@@ -219,7 +209,6 @@
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
 					/* Run ALS sensor in S0 */
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <1000>;
 				};
 			};
@@ -229,7 +218,6 @@
 			compatible = "cros-ec,tcs3400-rgb";
 			status = "okay";
 
-			label = "RGB Light";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_CAMERA";
 			default-range = <0x10000>; /* scale = 1x, uscale = 0 */
diff --git a/zephyr/projects/herobrine/motionsense_villager.dts b/zephyr/projects/herobrine/motionsense_villager.dts
index 92cc051a8e..1c2541c902 100644
--- a/zephyr/projects/herobrine/motionsense_villager.dts
+++ b/zephyr/projects/herobrine/motionsense_villager.dts
@@ -26,11 +26,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		mutex_bmi260: bmi260-mutex {
-			label = "BMI260_MUTEX";
 		};
 	};
 
@@ -73,7 +71,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 */
 	motionsense-sensor {
@@ -81,7 +79,6 @@
 			compatible = "cros-ec,kx022";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -94,11 +91,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -108,7 +103,6 @@
 			compatible = "cros-ec,bmi260-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi260>;
@@ -119,11 +113,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -133,7 +125,6 @@
 			compatible = "cros-ec,bmi260-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi260>;
diff --git a/zephyr/projects/nissa/craask_motionsense.dts b/zephyr/projects/nissa/craask_motionsense.dts
index 8f217aa945..276fc14ff2 100644
--- a/zephyr/projects/nissa/craask_motionsense.dts
+++ b/zephyr/projects/nissa/craask_motionsense.dts
@@ -25,11 +25,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		base_mutex: base-mutex {
-			label = "BASE_MUTEX";
 		};
 	};
 
@@ -72,7 +70,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 * TODO(b/238139272): The first entries of the array must be
 	 * accelerometers,then gyroscope. Fix this dependency in the DTS
@@ -83,7 +81,6 @@
 			compatible = "cros-ec,lis2dw12";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -96,11 +93,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -110,7 +105,6 @@
 			compatible = "cros-ec,lsm6dso-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
@@ -121,11 +115,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -135,7 +127,6 @@
 			compatible = "cros-ec,lsm6dso-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
diff --git a/zephyr/projects/nissa/joxer_motionsense.dts b/zephyr/projects/nissa/joxer_motionsense.dts
index a5a1756c89..3f589d132f 100644
--- a/zephyr/projects/nissa/joxer_motionsense.dts
+++ b/zephyr/projects/nissa/joxer_motionsense.dts
@@ -24,11 +24,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		base_mutex: base-mutex {
-			label = "BASE_MUTEX";
 		};
 	};
 
@@ -71,7 +69,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 * TODO(b/238139272): The first entries of the array must be
 	 * accelerometers,then gyroscope. Fix this dependency in the DTS
@@ -82,7 +80,6 @@
 			compatible = "cros-ec,bma4xx";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -94,11 +91,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -108,7 +103,6 @@
 			compatible = "cros-ec,bmi3xx-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
@@ -119,11 +113,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -133,7 +125,6 @@
 			compatible = "cros-ec,bmi3xx-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
diff --git a/zephyr/projects/nissa/nereid_motionsense.dts b/zephyr/projects/nissa/nereid_motionsense.dts
index a5a1756c89..3f589d132f 100644
--- a/zephyr/projects/nissa/nereid_motionsense.dts
+++ b/zephyr/projects/nissa/nereid_motionsense.dts
@@ -24,11 +24,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		base_mutex: base-mutex {
-			label = "BASE_MUTEX";
 		};
 	};
 
@@ -71,7 +69,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 * TODO(b/238139272): The first entries of the array must be
 	 * accelerometers,then gyroscope. Fix this dependency in the DTS
@@ -82,7 +80,6 @@
 			compatible = "cros-ec,bma4xx";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -94,11 +91,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -108,7 +103,6 @@
 			compatible = "cros-ec,bmi3xx-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
@@ -119,11 +113,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -133,7 +125,6 @@
 			compatible = "cros-ec,bmi3xx-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
diff --git a/zephyr/projects/nissa/nivviks_motionsense.dts b/zephyr/projects/nissa/nivviks_motionsense.dts
index 662ca949ec..fc2a3e2fe4 100644
--- a/zephyr/projects/nissa/nivviks_motionsense.dts
+++ b/zephyr/projects/nissa/nivviks_motionsense.dts
@@ -25,11 +25,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		base_mutex: base-mutex {
-			label = "BASE_MUTEX";
 		};
 	};
 
@@ -78,7 +76,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 * TODO(b/238139272): The first entries of the array must be
 	 * accelerometers,then gyroscope. Fix this dependency in the DTS
@@ -89,7 +87,6 @@
 			compatible = "cros-ec,lis2dw12";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -102,11 +99,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -116,7 +111,6 @@
 			compatible = "cros-ec,lsm6dso-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
@@ -131,11 +125,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -145,7 +137,6 @@
 			compatible = "cros-ec,lsm6dso-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
diff --git a/zephyr/projects/nissa/pujjo_motionsense.dts b/zephyr/projects/nissa/pujjo_motionsense.dts
index a5a1756c89..3f589d132f 100644
--- a/zephyr/projects/nissa/pujjo_motionsense.dts
+++ b/zephyr/projects/nissa/pujjo_motionsense.dts
@@ -24,11 +24,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		base_mutex: base-mutex {
-			label = "BASE_MUTEX";
 		};
 	};
 
@@ -71,7 +69,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 * TODO(b/238139272): The first entries of the array must be
 	 * accelerometers,then gyroscope. Fix this dependency in the DTS
@@ -82,7 +80,6 @@
 			compatible = "cros-ec,bma4xx";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -94,11 +91,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -108,7 +103,6 @@
 			compatible = "cros-ec,bmi3xx-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
@@ -119,11 +113,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -133,7 +125,6 @@
 			compatible = "cros-ec,bmi3xx-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
diff --git a/zephyr/projects/nissa/xivu_motionsense.dts b/zephyr/projects/nissa/xivu_motionsense.dts
index 8f217aa945..276fc14ff2 100644
--- a/zephyr/projects/nissa/xivu_motionsense.dts
+++ b/zephyr/projects/nissa/xivu_motionsense.dts
@@ -25,11 +25,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		base_mutex: base-mutex {
-			label = "BASE_MUTEX";
 		};
 	};
 
@@ -72,7 +70,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 * TODO(b/238139272): The first entries of the array must be
 	 * accelerometers,then gyroscope. Fix this dependency in the DTS
@@ -83,7 +81,6 @@
 			compatible = "cros-ec,lis2dw12";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -96,11 +93,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -110,7 +105,6 @@
 			compatible = "cros-ec,lsm6dso-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
@@ -121,11 +115,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -135,7 +127,6 @@
 			compatible = "cros-ec,lsm6dso-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&base_mutex>;
diff --git a/zephyr/projects/skyrim/motionsense.dts b/zephyr/projects/skyrim/motionsense.dts
index 642a1cddf8..dd140bd971 100644
--- a/zephyr/projects/skyrim/motionsense.dts
+++ b/zephyr/projects/skyrim/motionsense.dts
@@ -26,11 +26,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		mutex_bmi3xx: bmi3xx-mutex {
-			label = "BMI3XX_MUTEX";
 		};
 	};
 
@@ -57,7 +55,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 */
 	motionsense-sensor {
@@ -65,7 +63,6 @@
 			compatible = "cros-ec,bma4xx";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -77,12 +74,10 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(12500 | ROUND_UP_FLAG)>;
 					ec-rate = <100>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(12500 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -92,7 +87,6 @@
 			compatible = "cros-ec,bmi3xx-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi3xx>;
@@ -104,12 +98,10 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(12500 | ROUND_UP_FLAG)>;
 					ec-rate = <100>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(12500 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -119,7 +111,6 @@
 			compatible = "cros-ec,bmi3xx-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi3xx>;
diff --git a/zephyr/projects/trogdor/lazor/motionsense.dts b/zephyr/projects/trogdor/lazor/motionsense.dts
index adae7a736b..583444daec 100644
--- a/zephyr/projects/trogdor/lazor/motionsense.dts
+++ b/zephyr/projects/trogdor/lazor/motionsense.dts
@@ -26,11 +26,9 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
 		};
 
 		mutex_bmi160: bmi160-mutex {
-			label = "BMI160_MUTEX";
 		};
 	};
 
@@ -78,7 +76,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 */
 	motionsense-sensor {
@@ -86,7 +84,6 @@
 			compatible = "cros-ec,bma255";
 			status = "okay";
 
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -99,11 +96,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -113,7 +108,6 @@
 			compatible = "cros-ec,bmi160-accel";
 			status = "okay";
 
-			label = "Base Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi160>;
@@ -124,11 +118,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
@@ -138,7 +130,6 @@
 			compatible = "cros-ec,bmi160-gyro";
 			status = "okay";
 
-			label = "Base Gyro";
 			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi160>;
@@ -156,7 +147,6 @@
 		alt_lid_accel {
 			compatible = "cros-ec,kx022";
 			status = "okay";
-			label = "Lid Accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&lid_mutex>;
@@ -168,11 +158,9 @@
 				compatible =
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <(10000 | ROUND_UP_FLAG)>;
 				};
 			};
diff --git a/zephyr/shim/src/motionsense_sensors.c b/zephyr/shim/src/motionsense_sensors.c
index c9ab9ab85e..2480aa8477 100644
--- a/zephyr/shim/src/motionsense_sensors.c
+++ b/zephyr/shim/src/motionsense_sensors.c
@@ -206,12 +206,13 @@ DT_FOREACH_CHILD(SENSOR_ROT_REF_NODE, DECLARE_SENSOR_ROT_REF)
 		   (CREATE_SENSOR_CONFIG(DT_CHILD(id, configs)), ))
 
 /* Get and assign the basic information for a motion sensor */
-#define SENSOR_BASIC_INFO(id)                                                  \
-	.name = DT_LABEL(id), .active_mask = DT_STRING_TOKEN(id, active_mask), \
-	.location = DT_STRING_TOKEN(id, location),                             \
-	.default_range = DT_PROP(id, default_range),                           \
-	SENSOR_I2C_SPI_ADDR_FLAGS(id) SENSOR_MUTEX(id) SENSOR_I2C_PORT(id)     \
-		SENSOR_ROT_STD_REF(id) SENSOR_DRV_DATA(id) SENSOR_CONFIG(id)   \
+#define SENSOR_BASIC_INFO(id)                                                \
+	.name = DT_NODE_FULL_NAME(id),                                       \
+	.active_mask = DT_STRING_TOKEN(id, active_mask),                     \
+	.location = DT_STRING_TOKEN(id, location),                           \
+	.default_range = DT_PROP(id, default_range),                         \
+	SENSOR_I2C_SPI_ADDR_FLAGS(id) SENSOR_MUTEX(id) SENSOR_I2C_PORT(id)   \
+		SENSOR_ROT_STD_REF(id) SENSOR_DRV_DATA(id) SENSOR_CONFIG(id) \
 			SENSOR_INT_SIGNAL(id) SENSOR_FLAGS(id)
 
 /* Create motion sensor node with node ID */
diff --git a/zephyr/test/drivers/overlay.dts b/zephyr/test/drivers/overlay.dts
index 7e4820dab6..d7eaaf1116 100644
--- a/zephyr/test/drivers/overlay.dts
+++ b/zephyr/test/drivers/overlay.dts
@@ -436,19 +436,15 @@
 	motionsense-mutex {
 		compatible = "cros-ec,motionsense-mutex";
 		mutex_bma255: bma255-mutex {
-			label = "BMA255_MUTEX";
 		};
 
 		mutex_bmi260: bmi260-mutex {
-			label = "BMI260_MUTEX";
 		};
 
 		mutex_bmi160: bmi160-mutex {
-			label = "BMI160_MUTEX";
 		};
 
 		mutex_lis2dw12: lis2dw12-mutex {
-			label = "LIS2DW12_MUTEX";
 		};
 	};
 
@@ -544,7 +540,7 @@
 
 	/*
 	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
+	 * The nodelabel "lid_accel" and "base_accel" are used to indicate
 	 * motion sensor IDs for lid angle calculation.
 	 */
 	motionsense-sensor {
@@ -552,7 +548,6 @@
 			compatible = "cros-ec,bma255";
 			status = "okay";
 
-			label = "BMA255";
 			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
 			location = "MOTIONSENSE_LOC_LID";
 			mutex = <&mutex_bma255>;
@@ -565,15 +560,12 @@
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
 					/* Run ALS sensor in S0 */
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <1000>;
 				};
 				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
 					odr = <10000>;
 				};
 				ec-s5 {
-					label = "SENSOR_CONFIG_EC_S5";
 					odr = <10000>;
 				};
 			};
@@ -582,7 +574,6 @@
 			compatible = "cros-ec,bmi260-accel";
 			status = "okay";
 
-			label = "BMI260 emul accel";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi260>;
 			port = <&i2c_accel>;
@@ -595,7 +586,6 @@
 			compatible = "cros-ec,bmi260-gyro";
 			status = "okay";
 
-			label = "BMI260 emul gyro";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi260>;
 			port = <&i2c_accel>;
@@ -608,7 +598,6 @@
 			compatible = "cros-ec,bmi160-accel";
 			status = "okay";
 
-			label = "BMI160 emul accel";
 			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi160>;
@@ -622,7 +611,6 @@
 			compatible = "cros-ec,bmi160-gyro";
 			status = "okay";
 
-			label = "BMI160 emul gyro";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_bmi160>;
 			port = <&i2c_sensor>;
@@ -635,7 +623,6 @@
 			compatible = "cros-ec,lis2dw12";
 			status = "okay";
 
-			label = "LIS2DW12";
 			location = "MOTIONSENSE_LOC_BASE";
 			mutex = <&mutex_lis2dw12>;
 			port = <&i2c_accel>;
@@ -648,7 +635,6 @@
 			compatible = "cros-ec,tcs3400-clear";
 			status = "okay";
 
-			label = "Clear Light";
 			location = "MOTIONSENSE_LOC_BASE";
 			port = <&i2c_sensor>;
 			default-range = <0x10000>;
@@ -659,7 +645,6 @@
 					"cros-ec,motionsense-sensor-config";
 				ec-s0 {
 					/* Run ALS sensor in S0 */
-					label = "SENSOR_CONFIG_EC_S0";
 					odr = <1000>;
 				};
 			};
@@ -669,7 +654,6 @@
 			compatible = "cros-ec,tcs3400-rgb";
 			status = "okay";
 
-			label = "RGB Light";
 			location = "MOTIONSENSE_LOC_BASE";
 			default-range = <0x10000>; /* scale = 1x, uscale = 0 */
 			drv-data = <&tcs_rgb_data>;