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

diff --git a/driver/charger/bq24773.c b/driver/charger/bq24773.c
deleted file mode 100644
index d242f105c6..0000000000
--- a/driver/charger/bq24773.c
+++ /dev/null
@@ -1,308 +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.
- */
-
-#include "battery_smart.h"
-#include "bq24773.h"
-#include "charger.h"
-#include "console.h"
-#include "common.h"
-#include "util.h"
-
-/*
- * on the I2C version of the charger,
- * some registers are 8-bit only (eg input current)
- * and they are shifted by 6 bits compared to the SMBUS version (bq24770).
- */
-#define REG8_SHIFT 6
-#define R8 (1 << (REG8_SHIFT))
-/* Sense resistor configurations and macros */
-#define DEFAULT_SENSE_RESISTOR 10
-#define R_SNS CONFIG_CHARGER_SENSE_RESISTOR
-#define R_AC  (CONFIG_CHARGER_SENSE_RESISTOR_AC)
-#define REG_TO_CURRENT(REG, RS) ((REG) * DEFAULT_SENSE_RESISTOR / (RS))
-#define CURRENT_TO_REG(CUR, RS) ((CUR) * (RS) / DEFAULT_SENSE_RESISTOR)
-#define REG8_TO_CURRENT(REG, RS) ((REG) * DEFAULT_SENSE_RESISTOR / (RS) * R8)
-#define CURRENT_TO_REG8(CUR, RS) ((CUR) * (RS) / DEFAULT_SENSE_RESISTOR / R8)
-
-/* ChargeCurrent Register - 0x14 (mA) */
-#define CHARGE_I_OFF                    0
-#define CHARGE_I_MIN                    128
-#define CHARGE_I_MAX                    8128
-#define CHARGE_I_STEP                   64
-
-/* MaxChargeVoltage Register - 0x15 (mV) */
-#define CHARGE_V_MIN                    1024
-#define CHARGE_V_MAX                    19200
-#define CHARGE_V_STEP                   16
-
-/* InputCurrent Register - 0x3f (mA) */
-#define INPUT_I_MIN                    128
-#define INPUT_I_MAX                    8128
-#define INPUT_I_STEP                   64
-
-/* Charger parameters */
-static const struct charger_info bq2477x_charger_info = {
-	.name         = CHARGER_NAME,
-	.voltage_max  = CHARGE_V_MAX,
-	.voltage_min  = CHARGE_V_MIN,
-	.voltage_step = CHARGE_V_STEP,
-	.current_max  = REG_TO_CURRENT(CHARGE_I_MAX, R_SNS),
-	.current_min  = REG_TO_CURRENT(CHARGE_I_MIN, R_SNS),
-	.current_step = REG_TO_CURRENT(CHARGE_I_STEP, R_SNS),
-	.input_current_max  = REG_TO_CURRENT(INPUT_I_MAX, R_AC),
-	.input_current_min  = REG_TO_CURRENT(INPUT_I_MIN, R_AC),
-	.input_current_step = REG_TO_CURRENT(INPUT_I_STEP, R_AC),
-};
-
-#ifdef CONFIG_CHARGER_BQ24773
-static inline enum ec_error_list raw_read8(int chgnum, int offset, int *value)
-{
-	return i2c_read8(chg_chips[chgnum].i2c_port,
-			 chg_chips[chgnum].i2c_addr_flags,
-			 offset, value);
-}
-
-static inline enum ec_error_list raw_write8(int chgnum, int offset, int value)
-{
-	return i2c_write8(chg_chips[chgnum].i2c_port,
-			  chg_chips[chgnum].i2c_addr_flags,
-			  offset, value);
-}
-#endif
-
-static inline enum ec_error_list raw_read16(int chgnum, int offset, int *value)
-{
-	return i2c_read16(chg_chips[chgnum].i2c_port,
-			  chg_chips[chgnum].i2c_addr_flags,
-			  offset, value);
-}
-
-static inline enum ec_error_list raw_write16(int chgnum, int offset, int value)
-{
-	return i2c_write16(chg_chips[chgnum].i2c_port,
-			   chg_chips[chgnum].i2c_addr_flags,
-			   offset, value);
-}
-
-
-/* chip specific interfaces */
-
-static enum ec_error_list bq2477x_set_input_current_limit(int chgnum,
-							  int input_current)
-{
-#ifdef CONFIG_CHARGER_BQ24770
-	return raw_write16(chgnum, REG_INPUT_CURRENT,
-			   CURRENT_TO_REG(input_current, R_AC));
-#elif defined(CONFIG_CHARGER_BQ24773)
-	return raw_write8(chgnum, REG_INPUT_CURRENT,
-			  CURRENT_TO_REG8(input_current, R_AC));
-#endif
-}
-
-static enum ec_error_list bq2477x_get_input_current_limit(int chgnum,
-							  int *input_current)
-{
-	int rv;
-	int reg;
-
-#ifdef CONFIG_CHARGER_BQ24770
-	rv = raw_read16(chgnum, REG_INPUT_CURRENT, &reg);
-#elif defined(CONFIG_CHARGER_BQ24773)
-	rv = raw_read8(chgnum, REG_INPUT_CURRENT, &reg);
-#endif
-	if (rv)
-		return rv;
-
-#ifdef CONFIG_CHARGER_BQ24770
-	*input_current = REG_TO_CURRENT(reg, R_AC);
-#elif defined(CONFIG_CHARGER_BQ24773)
-	*input_current = REG8_TO_CURRENT(reg, R_AC);
-#endif
-	return EC_SUCCESS;
-}
-
-static enum ec_error_list bq2477x_manufacturer_id(int chgnum, int *id)
-{
-#ifdef CONFIG_CHARGER_BQ24770
-	return raw_read16(chgnum, REG_MANUFACTURE_ID, id);
-#elif defined(CONFIG_CHARGER_BQ24773)
-	*id = 0x40; /* TI */
-	return EC_SUCCESS;
-#endif
-}
-
-static enum ec_error_list bq2477x_device_id(int chgnum, int *id)
-{
-#ifdef CONFIG_CHARGER_BQ24770
-	return raw_read16(chgnum, REG_DEVICE_ADDRESS, id);
-#elif defined(CONFIG_CHARGER_BQ24773)
-	return raw_read8(chgnum, REG_DEVICE_ADDRESS, id);
-#endif
-}
-
-static enum ec_error_list bq2477x_get_option(int chgnum, int *option)
-{
-	return raw_read16(chgnum, REG_CHARGE_OPTION0, option);
-}
-
-static enum ec_error_list bq2477x_set_option(int chgnum, int option)
-{
-	return raw_write16(chgnum, REG_CHARGE_OPTION0, option);
-}
-
-/* Charger interfaces */
-
-static const struct charger_info *bq2477x_get_info(int chgnum)
-{
-	return &bq2477x_charger_info;
-}
-
-static enum ec_error_list bq2477x_get_status(int chgnum, int *status)
-{
-	int rv;
-	int option;
-
-	rv = bq2477x_get_option(chgnum, &option);
-	if (rv)
-		return rv;
-
-	/* Default status */
-	*status = CHARGER_LEVEL_2;
-
-	if (option & OPTION0_CHARGE_INHIBIT)
-		*status |= CHARGER_CHARGE_INHIBITED;
-
-	return EC_SUCCESS;
-}
-
-static enum ec_error_list bq2477x_set_mode(int chgnum, int mode)
-{
-	int rv;
-	int option;
-
-	rv = bq2477x_get_option(chgnum, &option);
-	if (rv)
-		return rv;
-
-	if (mode & CHARGE_FLAG_INHIBIT_CHARGE)
-		option |= OPTION0_CHARGE_INHIBIT;
-	else
-		option &= ~OPTION0_CHARGE_INHIBIT;
-	return bq2477x_set_option(chgnum, option);
-}
-
-static enum ec_error_list bq2477x_get_current(int chgnum, int *current)
-{
-	int rv;
-	int reg;
-
-	rv = raw_read16(chgnum, REG_CHARGE_CURRENT, &reg);
-
-	if (rv)
-		return rv;
-
-	*current = REG_TO_CURRENT(reg, R_SNS);
-	return EC_SUCCESS;
-}
-
-static enum ec_error_list bq2477x_set_current(int chgnum, int current)
-{
-	current = charger_closest_current(current);
-	return raw_write16(chgnum, REG_CHARGE_CURRENT,
-			   CURRENT_TO_REG(current, R_SNS));
-}
-
-static enum ec_error_list bq2477x_get_voltage(int chgnum, int *voltage)
-{
-	return raw_read16(chgnum, REG_MAX_CHARGE_VOLTAGE, voltage);
-}
-
-static enum ec_error_list bq2477x_set_voltage(int chgnum, int voltage)
-{
-	voltage = charger_closest_voltage(voltage);
-	return raw_write16(chgnum, REG_MAX_CHARGE_VOLTAGE, voltage);
-}
-
-/* Charging power state initialization */
-static enum ec_error_list bq2477x_post_init(int chgnum)
-{
-	int rv, option;
-#ifdef CONFIG_CHARGER_ILIM_PIN_DISABLED
-	int option2;
-#endif
-
-	rv = bq2477x_get_option(chgnum, &option);
-	if (rv)
-		return rv;
-
-	option &= ~OPTION0_LEARN_ENABLE;
-	rv = bq2477x_set_option(chgnum, option);
-	if (rv)
-		return rv;
-
-	/* Turn off PROCHOT warning */
-	rv = raw_read16(chgnum, REG_PROCHOT_OPTION1, &option);
-	if (rv)
-		return rv;
-
-	option &= ~PROCHOT_OPTION1_SELECTOR_MASK;
-	rv = raw_write16(chgnum, REG_PROCHOT_OPTION1, option);
-
-	if (rv)
-		return rv;
-
-#ifdef CONFIG_CHARGER_ILIM_PIN_DISABLED
-	/* Read the external ILIM pin enabled flag. */
-	rv = raw_read16(chgnum, REG_CHARGE_OPTION2, &option2);
-	if (rv)
-		return rv;
-
-	/* Set ILIM pin disabled if it is currently enabled. */
-	if (option2 & OPTION2_EN_EXTILIM) {
-		option2 &= ~OPTION2_EN_EXTILIM;
-		rv = raw_write16(chgnum, REG_CHARGE_OPTION2, option2);
-	}
-	return rv;
-#else
-	return EC_SUCCESS;
-#endif
-}
-
-static enum ec_error_list bq2477x_discharge_on_ac(int chgnum, int enable)
-{
-	int rv;
-	int option;
-
-	rv = bq2477x_get_option(chgnum, &option);
-	if (rv)
-		return rv;
-
-	if (enable)
-		rv = bq2477x_set_option(chgnum, option | OPTION0_LEARN_ENABLE);
-	else
-		rv = bq2477x_set_option(chgnum, option & ~OPTION0_LEARN_ENABLE);
-
-	return rv;
-}
-
-const struct charger_drv bq2477x_drv = {
-	.post_init = &bq2477x_post_init,
-	.get_info = &bq2477x_get_info,
-	.get_status = &bq2477x_get_status,
-	.set_mode = &bq2477x_set_mode,
-	.get_current = &bq2477x_get_current,
-	.set_current = &bq2477x_set_current,
-	.get_voltage = &bq2477x_get_voltage,
-	.set_voltage = &bq2477x_set_voltage,
-	.discharge_on_ac = &bq2477x_discharge_on_ac,
-	.set_input_current_limit = &bq2477x_set_input_current_limit,
-	.get_input_current_limit = &bq2477x_get_input_current_limit,
-	.manufacturer_id = &bq2477x_manufacturer_id,
-	.device_id = &bq2477x_device_id,
-	.get_option = &bq2477x_get_option,
-	.set_option = &bq2477x_set_option,
-};