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>

1 files changed, 0 insertions, 127 deletions

diff --git a/zephyr/shim/src/motionsense_driver/drvdata-accelgyro.h b/zephyr/shim/src/motionsense_driver/drvdata-accelgyro.h
deleted file mode 100644
index 069587f90f..0000000000
--- a/zephyr/shim/src/motionsense_driver/drvdata-accelgyro.h
+++ /dev/null
@@ -1,127 +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.
- */
-
-/*
- * Macros are to help creating driver data. A driver data that uses
- * any data structures defined in accelgyro.h should use the macros here
- * to utilize the information in device tree.
- *
- */
-#ifndef __ZEPHYR_SHIM_SRC_MOTIONSENSE_DRIVER_DRVDATA_ACCELGYRO_H
-#define __ZEPHYR_SHIM_SRC_MOTIONSENSE_DRIVER_DRVDATA_ACCELGYRO_H
-
-/*
- * compatible = "cros-ec,accelgyro-als-channel-scale"
- * als_channel_scale_t in accelgyro.h
- *
- * e.g) The following is the example in DT for als_channel_scale_t
- * als-channel-scale {
- *	compatible = "cros-ec,accelgyro-als-channel-scale";
- *		k-channel-scale = <1>;
- *		cover-scale = <1>;
- *	};
- */
-#define ACCELGYRO_ALS_CHANNEL_SCALE(id)					\
-	{								\
-		.k_channel_scale =					\
-			ALS_CHANNEL_SCALE(DT_PROP(id, k_channel_scale)),\
-		.cover_scale =						\
-			ALS_CHANNEL_SCALE(DT_PROP(id, cover_scale)),	\
-	}
-
-#define ALS_CALIBRATION_CHANNEL_SCALE(id)				\
-	.als_cal.channel_scale = ACCELGYRO_ALS_CHANNEL_SCALE(id),
-
-#define ALS_CALIBRATION_SET(id)					\
-	.als_cal.scale = DT_PROP(id, scale),			\
-	.als_cal.uscale = DT_PROP(id, uscale),			\
-	.als_cal.offset = DT_PROP(id, offset),			\
-	ALS_CALIBRATION_CHANNEL_SCALE(DT_CHILD(id, als_channel_scale))
-
-/*
- * compatible = "cros-ec,accelgyro-als-drv-data"
- * als_drv_data_t in accelgyro.h
- *
- * e.g) The following is the example in DT for als_drv_data_t 
- * 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>;
- *		};
- *	};
- * };
- */
-#define ACCELGYRO_ALS_DRV_DATA(id)					\
-	{								\
-		ALS_CALIBRATION_SET(DT_CHILD(id, als_cal))		\
-	}
-
-#define RGB_CAL_RGB_SET_SCALE(id)			\
-	.scale = ACCELGYRO_ALS_CHANNEL_SCALE(id),
-
-#define RGB_CAL_RGB_SET_ONE(id, suffix)					\
-	.rgb_cal[suffix] = {						\
-	    .offset = DT_PROP(id, offset),				\
-	    .coeff[0] = FLOAT_TO_FP(DT_PROP_BY_IDX(id, coeff, 0)),	\
-	    .coeff[1] = FLOAT_TO_FP(DT_PROP_BY_IDX(id, coeff, 1)),	\
-	    .coeff[2] = FLOAT_TO_FP(DT_PROP_BY_IDX(id, coeff, 2)),	\
-	    .coeff[3] = FLOAT_TO_FP(DT_PROP_BY_IDX(id, coeff, 3)),	\
-	    RGB_CAL_RGB_SET_SCALE(DT_CHILD(id, als_channel_scale))	\
-	},
-
-/*
- * compatible = "cros-ec,accelgyro-rgb-calibration"
- * rgb_calibration_t in accelgyro.h
- *
- * e.g) The following is the example in DT for rgb_calibration_t
- * 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>;
- *		};
- *	};
- * };
- */
-#define ACCELGYRO_RGB_CALIBRATION(id)				\
-	{							\
-		RGB_CAL_RGB_SET_ONE(DT_CHILD(id, rgb_cal_x), X)	\
-		RGB_CAL_RGB_SET_ONE(DT_CHILD(id, rgb_cal_y), Y)	\
-		RGB_CAL_RGB_SET_ONE(DT_CHILD(id, rgb_cal_z), Z)	\
-		.irt = INT_TO_FP(DT_PROP(id, irt)),		\
-	}
-
-#endif /* __ZEPHYR_SHIM_SRC_MOTIONSENSE_DRIVER_DRVDATA_ACCELGYRO_H */