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

diff --git a/driver/charger/bq24773.h b/driver/charger/bq24773.h
deleted file mode 100644
index 46f8939036..0000000000
--- a/driver/charger/bq24773.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2014 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 bq24773 battery charger driver.
- */
-
-#ifndef __CROS_EC_BQ24773_H
-#define __CROS_EC_BQ24773_H
-
-/* for i2c_read and i2c_write functions. */
-#include "i2c.h"
-
-/* I2C address */
-#define BQ24770_ADDR_FLAGS	0x09
-#define BQ24773_ADDR_FLAGS	0x6a
-
-/* Chip specific commands */
-#define BQ24770_CHARGE_OPTION0          0x12
-#define BQ24770_CHARGE_OPTION1          0x3B
-#define BQ24770_CHARGE_OPTION2          0x38
-#define BQ24770_PROCHOT_OPTION0         0x3C
-#define BQ24770_PROCHOT_OPTION1         0x3D
-#define BQ24770_CHARGE_CURRENT          0x14
-#define BQ24770_MAX_CHARGE_VOLTAGE      0x15
-#define BQ24770_MIN_SYSTEM_VOLTAGE      0x3E
-#define BQ24770_INPUT_CURRENT           0x3F
-#define BQ24770_MANUFACTURE_ID          0xFE
-#define BQ24770_DEVICE_ADDRESS          0xFF
-
-#define BQ24773_CHARGE_OPTION0          0x00
-#define BQ24773_CHARGE_OPTION1          0x02
-#define BQ24773_PROCHOT_OPTION0         0x04
-#define BQ24773_PROCHOT_OPTION1         0x06
-#define BQ24773_PROCHOT_STATUS          0x08
-#define BQ24773_DEVICE_ADDRESS          0x09
-#define BQ24773_CHARGE_CURRENT          0x0A
-#define BQ24773_MAX_CHARGE_VOLTAGE      0x0C
-#define BQ24773_MIN_SYSTEM_VOLTAGE      0x0E
-#define BQ24773_INPUT_CURRENT           0x0F
-#define BQ24773_CHARGE_OPTION2          0x10
-
-/* Option bits */
-#define OPTION0_CHARGE_INHIBIT          BIT(0)
-#define OPTION0_LEARN_ENABLE            BIT(5)
-#define OPTION0_SWITCHING_FREQ_MASK     (3 << 8)
-#define OPTION0_SWITCHING_FREQ_600KHZ   (0 << 8)
-#define OPTION0_SWITCHING_FREQ_800KHZ   BIT(8)
-#define OPTION0_SWITCHING_FREQ_1000KHZ  (2 << 8)
-#define OPTION0_SWITCHING_FREQ_1200KHZ  (3 << 8)
-
-#define OPTION2_EN_EXTILIM              BIT(7)
-
-/* Prochot Option bits */
-#define PROCHOT_OPTION1_SELECTOR_MASK   0x7f /* [6:0] PROCHOT SELECTOR */
-
-#ifdef CONFIG_CHARGER_BQ24770
-	#define CHARGER_NAME		"bq24770"
-	#define I2C_ADDR_CHARGER_FLAGS	BQ24770_ADDR_FLAGS
-
-	#define REG_CHARGE_OPTION0	BQ24770_CHARGE_OPTION0
-	#define REG_CHARGE_OPTION1	BQ24770_CHARGE_OPTION1
-	#define REG_CHARGE_OPTION2	BQ24770_CHARGE_OPTION2
-	#define REG_PROCHOT_OPTION0	BQ24770_PROCHOT_OPTION0
-	#define REG_PROCHOT_OPTION1	BQ24770_PROCHOT_OPTION1
-	#define REG_CHARGE_CURRENT	BQ24770_CHARGE_CURRENT
-	#define REG_MAX_CHARGE_VOLTAGE	BQ24770_MAX_CHARGE_VOLTAGE
-	#define REG_MIN_SYSTEM_VOLTAGE	BQ24770_MIN_SYSTEM_VOLTAGE
-	#define REG_INPUT_CURRENT	BQ24770_INPUT_CURRENT
-	#define REG_MANUFACTURE_ID	BQ24770_MANUFACTURE_ID
-	#define REG_DEVICE_ADDRESS	BQ24770_DEVICE_ADDRESS
-
-#elif defined(CONFIG_CHARGER_BQ24773)
-	#define CHARGER_NAME		"bq24773"
-	#define I2C_ADDR_CHARGER_FLAGS	BQ24773_ADDR_FLAGS
-
-	#define REG_CHARGE_OPTION0	BQ24773_CHARGE_OPTION0
-	#define REG_CHARGE_OPTION1	BQ24773_CHARGE_OPTION1
-	#define REG_CHARGE_OPTION2	BQ24773_CHARGE_OPTION2
-	#define REG_PROCHOT_OPTION0	BQ24773_PROCHOT_OPTION0
-	#define REG_PROCHOT_OPTION1	BQ24773_PROCHOT_OPTION1
-	#define REG_CHARGE_CURRENT	BQ24773_CHARGE_CURRENT
-	#define REG_MAX_CHARGE_VOLTAGE	BQ24773_MAX_CHARGE_VOLTAGE
-	#define REG_MIN_SYSTEM_VOLTAGE	BQ24773_MIN_SYSTEM_VOLTAGE
-	#define REG_INPUT_CURRENT	BQ24773_INPUT_CURRENT
-	#define REG_DEVICE_ADDRESS	BQ24773_DEVICE_ADDRESS
-#endif
-
-extern const struct charger_drv bq2477x_drv;
-
-#endif /* __CROS_EC_BQ24773_H */