ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

28 files changed, 0 insertions, 766 deletions

diff --git a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml
deleted file mode 100644
index c988af258d..0000000000
--- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-mutex.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2021 The Chromium OS Authors
-# SPDX-License-Identifier: Apache-2.0
-
-description: Motion sense mutex parent node
-
-compatible: "cros-ec,motionsense-mutex"
-
-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:
-#
-# 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-rotation-ref.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-rotation-ref.yaml
deleted file mode 100644
index 7de86ec8db..0000000000
--- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-rotation-ref.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: rotation reference parent node
-
-compatible: "cros-ec,motionsense-rotation-ref"
-
-child-binding:
-  description: |
-    A rotation matrix node is used to create
-    an instance of mat33_fp_t which is used by
-    sensor drivers.
-  properties:
-    mat33:
-      required: true
-      type: array
-      description: |
-        3x3 matrix to rotate x, y, and z axes.
-        Applications with the sensor API expects sansor data
-        based on the same defined coordinate system.
-        * X-axis is horizontal and positive toward the right
-        * Y-axis is vertical and positive toward the top
-        * Z-axis points toward the user
-
-        Depending on how the sensor is mounted on board(PCB), we
-        may need to change the direction of a axis and swap X and
-        Y-axis. Using the 3x3 matrix, it generates the correct
-        X,Y, and Z on the defined coordinate system.
-
-        +-        -+   +-        -+   +- -+
-        | v1 v2 v3 |   | sensor_X |   | X |
-        | v4 v5 v6 | * | sensor_Y | = | Y |
-        | v7 v8 v9 |   | sensor_Z |   | Z |
-        +-        -+   +-        -+   +- -+
-
-#
-# examples:
-#
-# motionsense-rotation-ref {
-#        compatible = "cros-ec,motionsense-rotation-ref";
-#        /* change the direction of Y and Z-axis */
-#        lid_rot_ref: lid-rotation-ref {
-#                mat33 = <1 0 0
-#                         0 (-1) 0
-#                         0 0 (-1)>;
-#        };
-#        /* swap X and Y-axis, and then change the direction of Y-axis */
-#        base_rot_ref: base-rotation-ref {
-#                mat33 = <0 1 0
-#                         (-1) 0 0
-#                         0 0 1>;
-#        };
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml
deleted file mode 100644
index 68cdd15637..0000000000
--- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-config.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: |
-    There are 4 configuration parameters to deal with different
-    configuration
-    Power   |         S0        |            S3     |      S5
-    --------+-------------------+-------------------+-----------------
-    From AP | <------- SENSOR_CONFIG_AP ----------> |
-            | Use for normal    | While sleeping    | Always disabled
-            | operation (game,  | For Activity      |
-            | screen rotation)  | Recognition       |
-    --------+-------------------+-------------------+------------------
-    From EC |SENSOR_CONFIG_EC_S0|SENSOR_CONFIG_EC_S3|SENSOR_CONFIG_EC_S5
-            | Background        | Gesture  Recognition (Double tap, ...)
-            | Activity (compass,|
-            | ambient light)    |
-
-compatible: "cros-ec,motionsense-sensor-config"
-
-child-binding:
-  description: |
-    A config node is used to create a motion_data_t instance.
-    Node name can only be either ap, ec-s0, ec-s3, or ec-s5,
-    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
-      description: |
-        Sensor output data rate in mHz.
-        MSB is used to know if we are rounding up.
-    ec-rate:
-      type: int
-      required: false
-      description: Delay between collection by EC, in us.
-
-#
-# examples:
-#
-# configs {
-#         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/cros-ec,motionsense-sensor-info.yaml b/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-info.yaml
deleted file mode 100644
index e413e2bfff..0000000000
--- a/zephyr/dts/bindings/motionsense/cros-ec,motionsense-sensor-info.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: The node has the information required by motion sense running
-
-compatible: "cros-ec,motionsense-sensor-info"
-
-properties:
-  als-sensors:
-    type: phandles
-    required: false
-    description: |
-        List of ALS sensors to create motion_als_sensors array.
-        The ALS sensors listed in the motion_als_sensors array
-        are managed by motion sense task. The task reads the sensor
-        data from the sensors and put them into the designated part
-        in the ec mmap. For example, als_clear and als_rgb are aliases
-        of ALS sensor noded defined in motionsense-sensor node.
-        als-sensors = <&als_clear, &als_rgb>;
-        This will automatically generate motion_als_sensors array from it.
-  sensor-irqs:
-    type: phandles
-    required: false
-    description: |
-        List of GPIO interrupts from sensors to be enabled.
-        GPIOs specified here will be enabled before motion sense task starts.
-        sensor-irqs = <&gpio_ec_imu_int_l &gpio_ec_als_rgb_int_l>;
-  accel-force-mode-sensors:
-    type: phandles
-    required: false
-    description: |
-        List of sensors should be handled in force mode. Sensors listed will be
-        used to define CONFIG_ACCEL_FORCE_MODE_MASK so that motion sense task can
-        manage them in force mode.
-        accel-force-mode-sensors = <&lid_accel &als_clear>;
-
-#
-# examples:
-#
-# motionsense-sensor-info {
-#        compatible = "cros-ec,motionsense-sensor-info";
-#
-#        /* list of entries for motion_als_sensors */
-#        als-sensors = <&als_clear>;
-#
-#        /*
-#         * list of GPIO interrupts that have to
-#         * be enabled at initial stage
-#         */
-#        sensor-irqs = <&gpio_ec_imu_int_l &gpio_ec_als_rgb_int_l>;
-#
-#        /* list of sensors in force mode */
-#        accel-force-mode-sensors = <&lid_accel &als_clear>;
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/driver/bmi160.yaml b/zephyr/dts/bindings/motionsense/driver/bmi160.yaml
deleted file mode 100644
index 8f490254a3..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/bmi160.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# common fields for both BMI160 accel and BMI160 gyro
-
-# every motionsense sensor node should include motionsense-sensor-base.yaml
-include: motionsense-sensor-base.yaml
-
-properties:
-  i2c-spi-addr-flags:
-    type: string
-    description: i2c address or SPI slave logic GPIO
-    enum:
-      - "BMI160_ADDR0_FLAGS"
-    default: "BMI160_ADDR0_FLAGS"
diff --git a/zephyr/dts/bindings/motionsense/driver/bmi260.yaml b/zephyr/dts/bindings/motionsense/driver/bmi260.yaml
deleted file mode 100644
index f308472ec3..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/bmi260.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# common fields for both BMI260 accel and BMI260 gyro
-
-# every motionsense sensor node should include motionsense-sensor-base.yaml
-include: motionsense-sensor-base.yaml
-
-properties:
-  i2c-spi-addr-flags:
-    type: string
-    description: i2c address or SPI slave logic GPIO
-    enum:
-      - "BMI260_ADDR0_FLAGS"
-    default: "BMI260_ADDR0_FLAGS"
diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bma255.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bma255.yaml
deleted file mode 100644
index 77d6282d7f..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bma255.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: motionsense sensor node for BMA255
-
-compatible: "cros-ec,bma255"
-
-# every motionsense sensor node should include motionsense-sensor-base.yaml
-include: motionsense-sensor-base.yaml
-
-properties:
-  i2c-spi-addr-flags:
-    type: string
-    description: i2c address or SPI slave logic GPIO
-    enum:
-      - "BMA2x2_I2C_ADDR1_FLAGS"
-      - "BMA2x2_I2C_ADDR2_FLAGS"
-      - "BMA2x2_I2C_ADDR3_FLAGS"
-      - "BMA2x2_I2C_ADDR4_FLAGS"
-    default: "BMA2x2_I2C_ADDR1_FLAGS"
diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-accel.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-accel.yaml
deleted file mode 100644
index 4eabf12cd5..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-accel.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: motion sense sensor node for BMI160 accel
-
-compatible: "cros-ec,bmi160-accel"
-
-include: bmi160.yaml
-
-properties:
-  default-range:
-    default: 4
diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-gyro.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-gyro.yaml
deleted file mode 100644
index b7a0b38290..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi160-gyro.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: motion sense sensor node for BMI160 gyro
-
-compatible: "cros-ec,bmi160-gyro"
-
-include: bmi160.yaml
-
-properties:
-  default-range:
-    default: 1000
diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-accel.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-accel.yaml
deleted file mode 100644
index 130600cca2..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-accel.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: motion sense sensor node for BMI260 accel
-
-compatible: "cros-ec,bmi260-accel"
-
-include: bmi260.yaml
-
-properties:
-  default-range:
-    default: 4
diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-gyro.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-gyro.yaml
deleted file mode 100644
index 00226d0304..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/cros-ec,bmi260-gyro.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: motion sense sensor node for BMI260 gyro
-
-compatible: "cros-ec,bmi260-gyro"
-
-include: bmi260.yaml
-
-properties:
-  default-range:
-    default: 1000
diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,kx022.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,kx022.yaml
deleted file mode 100644
index b90d824575..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/cros-ec,kx022.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: motionsense sensor node for KX022
-
-compatible: "cros-ec,kx022"
-
-# every motionsense sensor node should include motionsense-sensor-base.yaml
-include: motionsense-sensor-base.yaml
-
-properties:
-  i2c-spi-addr-flags:
-    type: string
-    description: i2c address or SPI slave logic GPIO
-    enum:
-      - "KX022_ADDR0_FLAGS"
-      - "KX022_ADDR1_FLAGS"
-    default: "KX022_ADDR0_FLAGS"
-  default-range:
-    default: 2
diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml
deleted file mode 100644
index bacf8f2c75..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: motionsense sensor node for LIS2DW12 Accelerometer
-
-compatible: "cros-ec,lis2dw12"
-
-# every motionsense sensor node should include motionsense-sensor-base.yaml
-include: motionsense-sensor-base.yaml
-
-properties:
-  i2c-spi-addr-flags:
-    type: string
-    description: i2c address or SPI peripheral logic GPIO
-    enum:
-      - "LIS2DWL_ADDR0_FLAGS"
-      - "LIS2DWL_ADDR1_FLAGS"
-    default: "LIS2DWL_ADDR1_FLAGS"
-  default-range:
-    default: 2
diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-clear.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-clear.yaml
deleted file mode 100644
index 323286c462..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-clear.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: motion sense sensor node for TCS3400 CLEAR
-
-compatible: "cros-ec,tcs3400-clear"
-
-include: tcs3400.yaml
diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-rgb.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-rgb.yaml
deleted file mode 100644
index e2987cf44b..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/cros-ec,tcs3400-rgb.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: motion sense sensor node for TCS3400 RGB
-
-compatible: "cros-ec,tcs3400-rgb"
-
-include: tcs3400.yaml
diff --git a/zephyr/dts/bindings/motionsense/driver/tcs3400.yaml b/zephyr/dts/bindings/motionsense/driver/tcs3400.yaml
deleted file mode 100644
index 2fc3d7eacd..0000000000
--- a/zephyr/dts/bindings/motionsense/driver/tcs3400.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# common fields for both TCS3400 clear and TCS3400 rgb
-
-# every motionsense sensor node should include motionsense-sensor-base.yaml
-include: motionsense-sensor-base.yaml
-
-properties:
-  i2c-spi-addr-flags:
-    type: string
-    description: i2c address or SPI slave logic GPIO
-    enum:
-      - "TCS3400_I2C_ADDR_FLAGS"
-    default: "TCS3400_I2C_ADDR_FLAGS"
-  default-range:
-    default: 0x10000 # scale = 1x, uscale = 0
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-channel-scale.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-channel-scale.yaml
deleted file mode 100644
index 753edc7ea8..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-channel-scale.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: |
-  Bindings for als_channel_scale_t in accelgyro.h.
-  Each channel has scaling factor for normalization & cover
-
-compatible: cros-ec,accelgyro-als-channel-scale
-
-properties:
-  k-channel-scale:
-    type: int
-    required: true
-    description: Channel scale factor
-  cover-scale:
-    type: int
-    required: true
-    description: Cover compensation scale factor
-
-#
-# examples:
-#
-# als-channel-scale {
-#        compatible = "cros-ec,accelgyro-als-channel-scale";
-#        k-channel-scale = <1>;
-#        cover-scale = <1>;
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-drv-data.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-drv-data.yaml
deleted file mode 100644
index 7d64689cf2..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-als-drv-data.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: ALS driver data
-
-compatible: "cros-ec,accelgyro-als-drv-data"
-
-child-binding:
-  description: ALS calibration data
-  properties:
-    scale:
-      type: int
-      required: true
-      description: |
-        Scale, uscale, and offset are used to correct the raw 16 bit ALS data
-        and then to convert it to 32 bit using the following equations
-        raw_value += offset;\n
-        adjusted_value = raw_value * scale + raw_value * uscale / 10000;
-    uscale:
-      type: int
-      required: true
-      description: uscale
-    offset:
-      type: int
-      required: true
-      description: offset
-
-#
-# examples:
-# als-drv-data {
-#        compatible = "cros-ec,accelgyro-als-drv-data";
-#        als-cal {
-#                scale = <1>;
-#                uscale = <0>;
-#                offset = <0>;
-#                als-channel-scale {
-#                compatible = "cros-ec,accelgyro-als-channel-scale";
-#                        k-channel-scale = <1>;
-#                        cover-scale = <1>;
-#                };
-#        };
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-rgb-calibration.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-rgb-calibration.yaml
deleted file mode 100644
index 4204a63cff..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,accelgyro-rgb-calibration.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: bindings for rgb_calibration_t in accelgyro.h
-
-compatible: "cros-ec,accelgyro-rgb-calibration"
-
-properties:
-  irt:
-    type: int
-    required: true
-    description: incandecent scaling factor
-
-child-binding:
-  description: RGB ALS Calibration Data
-  properties:
-    offset:
-      type: int
-      required: true
-      description: Any offset to add to raw channel data
-    coeff:
-      type: array
-      required: true
-      description: Clear, R, G, and B coefficients for this channel
-
-#
-# examples:
-#
-# rgb_calibration {
-#        compatible = "cros-ec,accelgyro-rgb-calibration";
-#
-#        irt = <1>;
-#
-#        rgb-cal-x {
-#                offset = <0>;
-#                coeff = <0 0 0 0>;
-#                als-channel-scale {
-#                compatible = "cros-ec,accelgyro-als-channel-scale";
-#                        k-channel-scale = <1>;
-#                        cover-scale = <1>;
-#                };
-#        };
-#        rgb-cal-y {
-#                offset = <0>;
-#                coeff = <0 0 0 0>;
-#                als-channel-scale {
-#                compatible = "cros-ec,accelgyro-als-channel-scale";
-#                        k-channel-scale = <1>;
-#                        cover-scale = <1>;
-#                };
-#        };
-#        rgb-cal-z {
-#                offset = <0>;
-#                coeff = <0 0 0 0>;
-#                als-channel-scale {
-#                compatible = "cros-ec,accelgyro-als-channel-scale";
-#                        k-channel-scale = <1>;
-#                        cover-scale = <1>;
-#                };
-#        };
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma255.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma255.yaml
deleted file mode 100644
index 4cabd620da..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bma255.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: BMA255 driver data node
-
-compatible: "cros-ec,drvdata-bma255"
-
-include: drvdata-base.yaml
-
-#
-# examples:
-#
-# bma255_data: bma255-drv-data {
-#       compatible = "cros-ec,drvdata-bma255";
-#       status = "okay";
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi160.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi160.yaml
deleted file mode 100644
index 52f5c346fc..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi160.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: BMI160 driver data node
-
-compatible: "cros-ec,drvdata-bmi160"
-
-include: drvdata-base.yaml
-
-#
-# examples:
-#
-# bmi160_data: bmi160-drv-data {
-#        compatible = "cros-ec,drvdata-bmi160";
-#        status = "okay";
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi260.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi260.yaml
deleted file mode 100644
index 4d414121d1..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-bmi260.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: BMI260 driver data node
-
-compatible: "cros-ec,drvdata-bmi260"
-
-include: drvdata-base.yaml
-
-#
-# examples:
-#
-# bmi260_data: bmi260-drv-data {
-#        compatible = "cros-ec,drvdata-bmi260";
-#        status = "okay";
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-kionix.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-kionix.yaml
deleted file mode 100644
index 3151412b79..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-kionix.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: Kionix driver data node
-
-compatible: "cros-ec,drvdata-kionix"
-
-include: drvdata-base.yaml
-
-#
-# examples:
-#
-# kx022_data: kx022-drv-data {
-#       compatible = "cros-ec,drvdata-kionix";
-#       status = "okay";
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml
deleted file mode 100644
index ecb182a4fd..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: LIS2DW12 driver data node
-
-compatible: "cros-ec,drvdata-lis2dw12"
-
-include: drvdata-base.yaml
-
-#
-# examples:
-#
-# lis2dw12_data: lis2dw12-drv-data {
-#        compatible = "cros-ec,drvdata-lis2dw12";
-#        status = "okay";
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-clear.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-clear.yaml
deleted file mode 100644
index c1059d40be..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-clear.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: TCS3400 CLEAR driver data
-
-compatible: "cros-ec,drvdata-tcs3400-clear"
-
-include: drvdata-base.yaml
-
-#
-# examples:
-#
-# tcs_clear_data: tcs3400-clear-drv-data {
-#        compatible = "cros-ec,drvdata-tcs3400-clear";
-#        status = "okay";
-#
-#        als-drv-data {
-#                compatible = "cros-ec,accelgyro-als-drv-data";
-#                als-cal {
-#                        scale = <1>;
-#                        uscale = <0>;
-#                        offset = <0>;
-#                        als-channel-scale {
-#                        compatible = "cros-ec,accelgyro-als-channel-scale";
-#                                k-channel-scale = <1>;
-#                                cover-scale = <1>;
-#                        };
-#                };
-#        };
-# };
-#
diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-rgb.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-rgb.yaml
deleted file mode 100644
index 7ae7bc5983..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-tcs3400-rgb.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: TCS3400 RGB driver data
-
-compatible: "cros-ec,drvdata-tcs3400-rgb"
-
-include: drvdata-base.yaml
-
-child-binding:
-  description: saturation auto-adjustment
-  properties:
-    again:
-      type: int
-      required: false
-      description: Gain Scaling; must be value between 0 and 3
-    atime:
-      type: int
-      required: false
-      description: Acquisition Time, controlled by the ATIME register
diff --git a/zephyr/dts/bindings/motionsense/drvdata/drvdata-base.yaml b/zephyr/dts/bindings/motionsense/drvdata/drvdata-base.yaml
deleted file mode 100644
index dc32d69d21..0000000000
--- a/zephyr/dts/bindings/motionsense/drvdata/drvdata-base.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# common fields for driver data
-
-include: base.yaml
-
-properties:
-  status:
-    required: true
diff --git a/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml b/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml
deleted file mode 100644
index 6948ce6997..0000000000
--- a/zephyr/dts/bindings/motionsense/motionsense-sensor-base.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Common fields for motion sensors
-
-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
-    enum:
-      - "SENSOR_ACTIVE_S5"
-      - "SENSOR_ACTIVE_S3"
-      - "SENSOR_ACTIVE_S0"
-      - "SENSOR_ACTIVE_S0_S3"
-      - "SENSOR_ACTIVE_S0_S3_S5"
-    default: "SENSOR_ACTIVE_S0_S3"
-  location:
-    type: string
-    required: true
-    description: location of the motion sensor
-    enum:
-      - "MOTIONSENSE_LOC_BASE"
-      - "MOTIONSENSE_LOC_LID"
-      - "MOTIONSENSE_LOC_CAMERA"
-  mutex:
-    type: phandle
-    required: false
-    description: mutex used by chip driver
-  port:
-    type: phandle
-    required: false
-    description: phandle to the named i2c port
-  rot-standard-ref:
-    type: phandle
-    required: false
-    description: phandle to 3x3 rotation matrix
-  default-range:
-    type: int
-    required: false
-    description: default range of sensor read
-  drv-data:
-    type: phandle
-    required: false
-    description: phandle to driver data to be used for the motion sensor
-  alternate-for:
-    type: phandle
-    description: phandle to another sensor that can be swapped with this one
-      at runtime.
-  alternate-indicator:
-    type: phandle
-    description: phandle to CBI SSGC value indicating that the sensor
-      should be used
-
-#
-# examples:
-#
-# lid_accel: lid-accel {
-#           compatible = "cros-ec,bma255";
-#           status = "okay";
-#
-#           label = "Lid Accel";
-#           active-mask = "SENSOR_ACTIVE_S0_S3";
-#           location = "MOTIONSENSE_LOC_LID";
-#           mutex = <&mutex_bma255>;
-#           port = <&i2c_sensor>;
-#           rot-standard-ref = <&lid_rot_ref>;
-#           default-range = <2>;
-#           drv-data = <&bma255_data>;
-# };
-#