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, 315 deletions

diff --git a/driver/als_opt3001.c b/driver/als_opt3001.c
deleted file mode 100644
index 53f2b7df89..0000000000
--- a/driver/als_opt3001.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* Copyright 2015 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.
- *
- * TI OPT3001 light sensor driver
- */
-
-#include "common.h"
-#include "driver/als_opt3001.h"
-#include "i2c.h"
-
-#ifdef HAS_TASK_ALS
-/**
- *  Read register from OPT3001 light sensor.
- */
-static int opt3001_i2c_read(const int reg, int *data_ptr)
-{
-	int ret;
-
-	ret = i2c_read16(I2C_PORT_ALS, OPT3001_I2C_ADDR_FLAGS,
-			 reg, data_ptr);
-	if (!ret)
-		*data_ptr = ((*data_ptr << 8) & 0xFF00) |
-				((*data_ptr >> 8) & 0x00FF);
-
-	return ret;
-}
-
-/**
- *  Write register to OPT3001 light sensor.
- */
-static int opt3001_i2c_write(const int reg, int data)
-{
-	data = ((data << 8) & 0xFF00) | ((data >> 8) & 0x00FF);
-	return i2c_write16(I2C_PORT_ALS, OPT3001_I2C_ADDR_FLAGS,
-			   reg, data);
-}
-
-/**
- * Initialise OPT3001 light sensor.
- */
-int opt3001_init(void)
-{
-	int data;
-	int ret;
-
-	ret = opt3001_i2c_read(OPT3001_REG_MAN_ID, &data);
-	if (ret)
-		return ret;
-	if (data != OPT3001_MANUFACTURER_ID)
-		return EC_ERROR_UNKNOWN;
-
-	ret = opt3001_i2c_read(OPT3001_REG_DEV_ID, &data);
-	if (ret)
-		return ret;
-	if (data != OPT3001_DEVICE_ID)
-		return EC_ERROR_UNKNOWN;
-
-	/*
-	 * [15:12]: 0101b Automatic full scale (1310.40lux, 0.32lux/lsb)
-	 * [11]   : 1b    Conversion time 800ms
-	 * [10:9] : 10b   Continuous Mode of conversion operation
-	 * [4]    : 1b    Latched window-style comparison operation
-	 */
-	return opt3001_i2c_write(OPT3001_REG_CONFIGURE, 0x5C10);
-}
-
-/**
- * Read OPT3001 light sensor data.
- */
-int opt3001_read_lux(int *lux, int af)
-{
-	int ret;
-	int data;
-
-	ret = opt3001_i2c_read(OPT3001_REG_RESULT, &data);
-	if (ret)
-		return ret;
-
-	/*
-	 * The default power-on values will give 12 bits of precision:
-	 * 0x0000-0x0fff indicates 0 to 1310.40 lux. We multiply the sensor
-	 * value by a scaling factor to account for attenuation by glass,
-	 * tinting, etc.
-	 */
-
-	/*
-	 * lux = 2EXP[3:0] × R[11:0] / 100
-	 */
-	*lux = (1 << ((data & 0xF000) >> 12)) * (data & 0x0FFF) * af / 100;
-
-	return EC_SUCCESS;
-}
-
-#ifdef CONFIG_CMD_I2C_STRESS_TEST_ALS
-struct i2c_stress_test_dev opt3001_i2c_stress_test_dev = {
-	.reg_info = {
-		.read_reg = OPT3001_REG_DEV_ID,
-		.read_val = OPT3001_DEVICE_ID,
-		.write_reg = OPT3001_REG_INT_LIMIT_LSB,
-	},
-	.i2c_read_dev = &opt3001_i2c_read,
-	.i2c_write_dev = &opt3001_i2c_write,
-};
-#endif  /* CONFIG_CMD_I2C_STRESS_TEST_ALS */
-#else  /* HAS_TASK_ALS */
-#include "accelgyro.h"
-#include "math_util.h"
-
-/**
- *  Read register from OPT3001 light sensor.
- */
-static int opt3001_i2c_read(const int port,
-			    const uint16_t i2c_addr_flags,
-			    const int reg, int *data_ptr)
-{
-	int ret;
-
-	ret = i2c_read16(port, i2c_addr_flags,
-			 reg, data_ptr);
-	if (!ret)
-		*data_ptr = ((*data_ptr << 8) & 0xFF00) |
-				((*data_ptr >> 8) & 0x00FF);
-
-	return ret;
-}
-
-/**
- *  Write register to OPT3001 light sensor.
- */
-static int opt3001_i2c_write(const int port,
-			     const uint16_t i2c_addr_flags,
-			     const int reg, int data)
-{
-	data = ((data << 8) & 0xFF00) | ((data >> 8) & 0x00FF);
-	return i2c_write16(port, i2c_addr_flags, reg, data);
-}
-
-/**
- * Read OPT3001 light sensor data.
- */
-int opt3001_read_lux(const struct motion_sensor_t *s, intv3_t v)
-{
-	struct opt3001_drv_data_t *drv_data = OPT3001_GET_DATA(s);
-	int ret;
-	int data;
-
-	ret = opt3001_i2c_read(s->port, s->i2c_spi_addr_flags,
-			       OPT3001_REG_RESULT, &data);
-	if (ret)
-		return ret;
-
-	/*
-	 * lux = 2EXP[3:0] × R[11:0] / 100
-	 */
-	data = (1 << (data >> 12)) * (data & 0x0FFF);
-	data += drv_data->offset * 100;
-	data = data * drv_data->scale + data * drv_data->uscale / 10000;
-	data /= 100;
-
-	if (data < 0)
-		data = 1;
-
-	v[0] = data;
-	v[1] = 0;
-	v[2] = 0;
-
-	/*
-	 * Return an error when nothing change to prevent filling the
-	 * fifo with useless data.
-	 */
-	if (v[0] == drv_data->last_value)
-		return EC_ERROR_UNCHANGED;
-	else {
-		drv_data->last_value = v[0];
-		return EC_SUCCESS;
-	}
-}
-
-static int opt3001_set_range(struct motion_sensor_t *s, int range,
-			     int rnd)
-{
-	struct opt3001_drv_data_t *drv_data = OPT3001_GET_DATA(s);
-
-	drv_data->scale = range >> 16;
-	drv_data->uscale = range & 0xffff;
-	s->current_range = range;
-	return EC_SUCCESS;
-}
-
-static int opt3001_set_data_rate(const struct motion_sensor_t *s,
-				int rate, int roundup)
-{
-	struct opt3001_drv_data_t *drv_data = OPT3001_GET_DATA(s);
-	int rv;
-	int reg;
-	enum opt3001_mode mode;
-
-	if (rate == 0) {
-		/*
-		 * Suspend driver:
-		 */
-		mode = OPT3001_MODE_SUSPEND;
-	} else {
-		mode = OPT3001_MODE_CONTINUOUS;
-		/*
-		 * We set the sensor for continuous mode,
-		 * integrating over 800ms.
-		 * Do not allow range higher than 1Hz.
-		 */
-		if (rate > OPT3001_LIGHT_MAX_FREQ)
-			rate = OPT3001_LIGHT_MAX_FREQ;
-	}
-	rv = opt3001_i2c_read(s->port, s->i2c_spi_addr_flags,
-			      OPT3001_REG_CONFIGURE, &reg);
-	if (rv)
-		return rv;
-
-	rv = opt3001_i2c_write(s->port, s->i2c_spi_addr_flags,
-			       OPT3001_REG_CONFIGURE,
-			       (reg & OPT3001_MODE_MASK) |
-				   (mode << OPT3001_MODE_OFFSET));
-	if (rv)
-		return rv;
-
-	drv_data->rate = rate;
-	return EC_SUCCESS;
-}
-
-static int opt3001_get_data_rate(const struct motion_sensor_t *s)
-{
-	struct opt3001_drv_data_t *drv_data = OPT3001_GET_DATA(s);
-
-	return drv_data->rate;
-}
-
-static int opt3001_set_offset(const struct motion_sensor_t *s,
-			const int16_t *offset,
-			int16_t    temp)
-{
-	struct opt3001_drv_data_t *drv_data = OPT3001_GET_DATA(s);
-
-	drv_data->offset = offset[X];
-	return EC_SUCCESS;
-}
-
-static int opt3001_get_offset(const struct motion_sensor_t *s,
-			int16_t   *offset,
-			int16_t    *temp)
-{
-	struct opt3001_drv_data_t *drv_data = OPT3001_GET_DATA(s);
-
-	offset[X] = drv_data->offset;
-	offset[Y] = 0;
-	offset[Z] = 0;
-	*temp = EC_MOTION_SENSE_INVALID_CALIB_TEMP;
-	return EC_SUCCESS;
-}
-/**
- * Initialise OPT3001 light sensor.
- */
-static int opt3001_init(struct motion_sensor_t *s)
-{
-	int data;
-	int ret;
-
-	ret = opt3001_i2c_read(s->port, s->i2c_spi_addr_flags,
-			       OPT3001_REG_MAN_ID, &data);
-	if (ret)
-		return ret;
-	if (data != OPT3001_MANUFACTURER_ID)
-		return EC_ERROR_ACCESS_DENIED;
-
-	ret = opt3001_i2c_read(s->port, s->i2c_spi_addr_flags,
-			       OPT3001_REG_DEV_ID, &data);
-	if (ret)
-		return ret;
-	if (data != OPT3001_DEVICE_ID)
-		return EC_ERROR_ACCESS_DENIED;
-
-	/*
-	 * [15-12]: 1100b Automatic full-scale setting mode
-	 * [11]   : 1b    Conversion time 800ms
-	 * [4]    : 1b    Latched window-style comparison operation
-	 */
-	opt3001_i2c_write(s->port, s->i2c_spi_addr_flags,
-			  OPT3001_REG_CONFIGURE, 0xC810);
-
-	opt3001_set_range(s, s->default_range, 0);
-
-	return EC_SUCCESS;
-}
-
-const struct accelgyro_drv opt3001_drv = {
-	.init = opt3001_init,
-	.read = opt3001_read_lux,
-	.set_range = opt3001_set_range,
-	.set_offset = opt3001_set_offset,
-	.get_offset = opt3001_get_offset,
-	.set_data_rate = opt3001_set_data_rate,
-	.get_data_rate = opt3001_get_data_rate,
-};
-
-#ifdef CONFIG_CMD_I2C_STRESS_TEST_ALS
-struct i2c_stress_test_dev opt3001_i2c_stress_test_dev = {
-	.reg_info = {
-		.read_reg = OPT3001_REG_DEV_ID,
-		.read_val = OPT3001_DEVICE_ID,
-		.write_reg = OPT3001_REG_INT_LIMIT_LSB,
-	},
-	.i2c_read = &opt3001_i2c_read,
-	.i2c_write = &opt3001_i2c_write,
-};
-#endif  /* CONFIG_CMD_I2C_STRESS_TEST_ALS */
-#endif  /* HAS_TASK_ALS */