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

diff --git a/driver/als_isl29035.c b/driver/als_isl29035.c
deleted file mode 100644
index db77a19f09..0000000000
--- a/driver/als_isl29035.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2013 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.
- *
- * Intersil ILS29035 light sensor driver
- */
-
-#include "driver/als_isl29035.h"
-#include "i2c.h"
-
-/* I2C interface */
-#define ILS29035_I2C_ADDR_FLAGS	0x44
-#define ILS29035_REG_COMMAND_I  0
-#define ILS29035_REG_COMMAND_II 1
-#define ILS29035_REG_DATA_LSB   2
-#define ILS29035_REG_DATA_MSB   3
-#define ILS29035_REG_INT_LT_LSB 4
-#define ILS29035_REG_INT_LT_MSB 5
-#define ILS29035_REG_INT_HT_LSB 6
-#define ILS29035_REG_INT_HT_MSB 7
-#define ILS29035_REG_ID         15
-
-int isl29035_init(void)
-{
-	/*
-	 * Tell it to read continually. This uses 70uA, as opposed to nearly
-	 * zero, but it makes the hook/update code cleaner (we don't want to
-	 * wait 90ms to read on demand while processing hook callbacks).
-	 */
-	return i2c_write8(I2C_PORT_ALS, ILS29035_I2C_ADDR_FLAGS,
-			  ILS29035_REG_COMMAND_I, 0xa0);
-}
-
-int isl29035_read_lux(int *lux, int af)
-{
-	int rv, lsb, msb, data;
-
-	/*
-	 * NOTE: It is necessary to read the LSB first, then the MSB. If you do
-	 * it in the opposite order, the results are not correct. This is
-	 * apparently an undocumented "feature". It's especially noticeable in
-	 * one-shot mode.
-	 */
-
-	/* Read lsb */
-	rv = i2c_read8(I2C_PORT_ALS, ILS29035_I2C_ADDR_FLAGS,
-		       ILS29035_REG_DATA_LSB, &lsb);
-	if (rv)
-		return rv;
-
-	/* Read msb */
-	rv = i2c_read8(I2C_PORT_ALS, ILS29035_I2C_ADDR_FLAGS,
-		       ILS29035_REG_DATA_MSB, &msb);
-	if (rv)
-		return rv;
-
-	data = (msb << 8) | lsb;
-
-	/*
-	 * The default power-on values will give 16 bits of precision:
-	 * 0x0000-0xffff indicates 0-1000 lux. We multiply the sensor value by
-	 * a scaling factor to account for attentuation by glass, tinting, etc.
-	 *
-	 * Caution: Don't go nuts with the attentuation factor. If it's
-	 * greater than 32, the signed int math will roll over and you'll get
-	 * very wrong results. Of course, if you have that much attenuation and
-	 * are still getting useful readings, you probably have your sensor
-	 * pointed directly into the sun.
-	 */
-	*lux = data * af * 1000 / 0xffff;
-
-	return EC_SUCCESS;
-}