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

diff --git a/driver/als_bh1730.c b/driver/als_bh1730.c
deleted file mode 100644
index 56afb86e0b..0000000000
--- a/driver/als_bh1730.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Copyright 2017 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.
- *
- * Rohm BH1730 Ambient light sensor driver
- */
-
-#include "accelgyro.h"
-#include "config.h"
-#include "console.h"
-#include "driver/als_bh1730.h"
-#include "i2c.h"
-
-#define CPRINTS(format, args...) cprints(CC_MOTION_SENSE, format, ## args)
-#define CPRINTF(format, args...) cprintf(CC_MOTION_SENSE, format, ## args)
-
-/**
- * Convert BH1730 data0, data1 to lux
- */
-static int bh1730_convert_to_lux(uint32_t data0_1)
-{
-	int lux;
-	uint16_t data0 = 0x0000ffff & data0_1;
-	uint16_t data1 = data0_1 >> 16;
-	uint32_t d0_1k = data0 * 1000;
-	uint32_t d1_1k = data1 * 1000;
-	uint32_t d_temp;
-	uint32_t d_lux;
-
-	if (data0 == 0)
-		return 0;
-	else
-		d_temp = d1_1k / data0;
-
-	if(d_temp < BH1730_LUXTH1_1K) {
-		d0_1k = BH1730_LUXTH1_D0_1K * data0;
-		d1_1k = BH1730_LUXTH1_D1_1K * data1;
-	} else if(d_temp < BH1730_LUXTH2_1K) {
-		d0_1k = BH1730_LUXTH2_D0_1K * data0;
-		d1_1k = BH1730_LUXTH2_D1_1K * data1;
-	} else if(d_temp < BH1730_LUXTH3_1K) {
-		d0_1k = BH1730_LUXTH3_D0_1K * data0;
-		d1_1k = BH1730_LUXTH3_D1_1K * data1;
-	} else if(d_temp < BH1730_LUXTH4_1K) {
-		d0_1k = BH1730_LUXTH4_D0_1K * data0;
-		d1_1k = BH1730_LUXTH4_D1_1K * data1;
-	} else
-		return 0;
-
-	d_lux = (d0_1k - d1_1k) / BH1730_GAIN_DIV;
-	d_lux *= 100;
-	lux = d_lux / ITIME_MS_X_1K;
-
-	return lux;
-}
-
-/**
- * Read BH1730 light sensor data.
- */
-static int bh1730_read_lux(const struct motion_sensor_t *s, intv3_t v)
-{
-	struct bh1730_drv_data_t *drv_data = BH1730_GET_DATA(s);
-	int ret;
-	int data0_1;
-
-	/* read data0 and data1 from sensor */
-	ret = i2c_read32(s->port, s->i2c_spi_addr_flags,
-			 BH1730_DATA0LOW, &data0_1);
-	if (ret != EC_SUCCESS) {
-		CPRINTF("bh1730_read_lux - fail %d\n", ret);
-		return ret;
-	}
-
-	/* convert sensor data0 and data1 to lux */
-	v[0] = bh1730_convert_to_lux(data0_1);
-	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
-		return EC_SUCCESS;
-}
-
-static int bh1730_set_range(struct motion_sensor_t *s, int range,
-			     int rnd)
-{
-	/* Range is fixed by hardware */
-	if (range != s->default_range)
-		return EC_ERROR_INVAL;
-
-	s->current_range = range;
-	return EC_SUCCESS;
-}
-
-static int bh1730_set_data_rate(const struct motion_sensor_t *s,
-				int rate, int roundup)
-{
-	struct bh1730_drv_data_t *drv_data = BH1730_GET_DATA(s);
-
-	/* now only one rate supported */
-	drv_data->rate = BH1730_10000_MHZ;
-
-	return EC_SUCCESS;
-}
-
-static int bh1730_get_data_rate(const struct motion_sensor_t *s)
-{
-	struct bh1730_drv_data_t *drv_data = BH1730_GET_DATA(s);
-
-	return drv_data->rate;
-}
-
-static int bh1730_set_offset(const struct motion_sensor_t *s,
-			const int16_t *offset,
-			int16_t    temp)
-{
-	return EC_SUCCESS;
-}
-
-static int bh1730_get_offset(const struct motion_sensor_t *s,
-			int16_t   *offset,
-			int16_t    *temp)
-{
-	*offset = 0;
-
-	return EC_SUCCESS;
-}
-
-/**
- * Initialise BH1730 Ambient light sensor.
- */
-static int bh1730_init(struct motion_sensor_t *s)
-{
-	int ret;
-
-	/* power and measurement bit high */
-	ret = i2c_write8(s->port, s->i2c_spi_addr_flags,
-			BH1730_CONTROL,
-			BH1730_CONTROL_POWER_ENABLE
-			      | BH1730_CONTROL_ADC_EN_ENABLE);
-
-	if (ret != EC_SUCCESS) {
-		CPRINTF("bh1730_init_sensor - enable fail %d\n", ret);
-		return ret;
-	}
-
-	/* set timing */
-	ret = i2c_write8(s->port, s->i2c_spi_addr_flags,
-			 BH1730_TIMING, BH1730_CONF_ITIME);
-	if (ret != EC_SUCCESS) {
-		CPRINTF("bh1730_init_sensor - time fail %d\n", ret);
-		return ret;
-	}
-	/* set ADC gain */
-	ret = i2c_write8(s->port, s->i2c_spi_addr_flags,
-			 BH1730_GAIN, BH1730_CONF_GAIN);
-
-	if (ret != EC_SUCCESS) {
-		CPRINTF("bh1730_init_sensor - gain fail %d\n", ret);
-		return ret;
-	}
-
-	return sensor_init_done(s);
-}
-
-const struct accelgyro_drv bh1730_drv = {
-	.init = bh1730_init,
-	.read = bh1730_read_lux,
-	.set_range = bh1730_set_range,
-	.set_offset = bh1730_set_offset,
-	.get_offset = bh1730_get_offset,
-	.set_data_rate = bh1730_set_data_rate,
-	.get_data_rate = bh1730_get_data_rate,
-};
-