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

diff --git a/driver/charger/bq24715.c b/driver/charger/bq24715.c
deleted file mode 100644
index d2eb0e432a..0000000000
--- a/driver/charger/bq24715.c
+++ /dev/null
@@ -1,252 +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.
- *
- * TI bq24715 battery charger driver.
- */
-
-#include "battery_smart.h"
-#include "bq24715.h"
-#include "charger.h"
-#include "console.h"
-#include "common.h"
-#include "i2c.h"
-#include "util.h"
-
-/* 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)
-
-/* Note: it is assumed that the sense resistors are 10mOhm. */
-
-static const struct charger_info bq24715_charger_info = {
-	.name         = "bq24715",
-	.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),
-};
-
-static inline enum ec_error_list sbc_read(int chgnum, int cmd, int *param)
-{
-	return i2c_read16(chg_chips[chgnum].i2c_port,
-			  chg_chips[chgnum].i2c_addr_flags,
-			  cmd, param);
-}
-
-static inline enum ec_error_list sbc_write(int chgnum, int cmd, int param)
-{
-	return i2c_write16(chg_chips[chgnum].i2c_port,
-			   chg_chips[chgnum].i2c_addr_flags,
-			   cmd, param);
-}
-
-static enum ec_error_list bq24715_set_input_current_limit(int chgnum,
-							  int input_current)
-{
-	return sbc_write(chgnum, BQ24715_INPUT_CURRENT,
-			 CURRENT_TO_REG(input_current, R_AC));
-}
-
-static enum ec_error_list bq24715_get_input_current_limit(int chgnum,
-							  int *input_current)
-{
-	int rv;
-	int reg;
-
-	rv = sbc_read(chgnum, BQ24715_INPUT_CURRENT, &reg);
-	if (rv)
-		return rv;
-
-	*input_current = REG_TO_CURRENT(reg, R_AC);
-
-	return EC_SUCCESS;
-}
-
-static enum ec_error_list bq24715_manufacturer_id(int chgnum, int *id)
-{
-	return sbc_read(chgnum, BQ24715_MANUFACTURER_ID, id);
-}
-
-static enum ec_error_list bq24715_device_id(int chgnum, int *id)
-{
-	return sbc_read(chgnum, BQ24715_DEVICE_ID, id);
-}
-
-static enum ec_error_list bq24715_get_option(int chgnum, int *option)
-{
-	return sbc_read(chgnum, BQ24715_CHARGE_OPTION, option);
-}
-
-static enum ec_error_list bq24715_set_option(int chgnum, int option)
-{
-	return sbc_write(chgnum, BQ24715_CHARGE_OPTION, option);
-}
-
-/* Charger interfaces */
-
-static const struct charger_info *bq24715_get_info(int chgnum)
-{
-	return &bq24715_charger_info;
-}
-
-static enum ec_error_list bq24715_get_status(int chgnum, int *status)
-{
-	int rv;
-	int option;
-
-	rv = bq24715_get_option(chgnum, &option);
-	if (rv)
-		return rv;
-
-	/* Default status */
-	*status = CHARGER_LEVEL_2;
-
-	if ((option & OPT_CHARGE_INHIBIT_MASK) == OPT_CHARGE_DISABLE)
-		*status |= CHARGER_CHARGE_INHIBITED;
-
-	return EC_SUCCESS;
-}
-
-static enum ec_error_list bq24715_set_mode(int chgnum, int mode)
-{
-	int rv;
-	int option;
-
-	rv = bq24715_get_option(chgnum, &option);
-	if (rv)
-		return rv;
-
-	option &= ~OPT_CHARGE_INHIBIT_MASK;
-	if (mode & CHARGE_FLAG_INHIBIT_CHARGE)
-		option |= OPT_CHARGE_DISABLE;
-	else
-		option |= OPT_CHARGE_ENABLE;
-	return bq24715_set_option(chgnum, option);
-}
-
-static enum ec_error_list bq24715_get_current(int chgnum, int *current)
-{
-	int rv;
-	int reg;
-
-	rv = sbc_read(chgnum, SB_CHARGING_CURRENT, &reg);
-	if (rv)
-		return rv;
-
-	*current = REG_TO_CURRENT(reg, R_SNS);
-	return EC_SUCCESS;
-}
-
-static enum ec_error_list bq24715_set_current(int chgnum, int current)
-{
-	current = charger_closest_current(current);
-
-	return sbc_write(chgnum, SB_CHARGING_CURRENT,
-			 CURRENT_TO_REG(current, R_SNS));
-}
-
-/* The voltage setting needs to be cached to work with the current
- * charging infrastructure and state machine. The reason is that
- * the state machine expects to be able to set a 0V charging voltage.
- * The bq24715 does not allow this in the hardware register. Therefore
- * 0V is handled specially to appease the state machine. */
-static int cached_voltage;
-
-static enum ec_error_list bq24715_get_voltage(int chgnum, int *voltage)
-{
-	int ret;
-
-	if (cached_voltage == 0) {
-		*voltage = cached_voltage;
-		return EC_SUCCESS;
-	}
-
-	ret = sbc_read(chgnum, SB_CHARGING_VOLTAGE, &cached_voltage);
-
-	if (ret == EC_SUCCESS)
-		*voltage = cached_voltage;
-
-	return ret;
-}
-
-static enum ec_error_list bq24715_set_voltage(int chgnum, int voltage)
-{
-	cached_voltage = voltage;
-	return sbc_write(chgnum, SB_CHARGING_VOLTAGE, voltage);
-}
-
-/* Charging power state initialization */
-static enum ec_error_list bq24715_post_init(int chgnum)
-{
-	int rv;
-	int option;
-
-	rv = bq24715_get_option(chgnum, &option);
-	if (rv)
-		return rv;
-
-	/* Don't be noisy */
-	option |= OPT_AUDIO_FREQ_40KHZ_LIMIT;
-
-	/* Always monitor adapter current (40X multiplier). */
-	option |= OPT_FIX_IOUT_ALWAYS;
-	option &= ~OPT_IOUT_MASK;
-	option &= ~OPT_LEARN_MASK;
-
-	/* Enable dynamic power management */
-	option |= OPT_IDPM_ENABLE;
-
-	rv = bq24715_set_option(chgnum, option);
-	if (rv)
-		return rv;
-
-	rv = bq24715_set_input_current_limit(chgnum,
-					     CONFIG_CHARGER_INPUT_CURRENT);
-	return rv;
-}
-
-static enum ec_error_list bq24715_discharge_on_ac(int chgnum, int enable)
-{
-	int rv;
-	int option;
-
-	rv = bq24715_get_option(chgnum, &option);
-	if (rv)
-		return rv;
-
-	option &= ~OPT_LEARN_MASK;
-	if (enable)
-		option |= OPT_LEARN_ENABLE;
-	else
-		option |= OPT_LEARN_DISABLE;
-	rv = bq24715_set_option(chgnum, option);
-
-	return rv;
-}
-
-const struct charger_drv bq24715_drv = {
-	.post_init = &bq24715_post_init,
-	.get_info = &bq24715_get_info,
-	.get_status = &bq24715_get_status,
-	.set_mode = &bq24715_set_mode,
-	.get_current = &bq24715_get_current,
-	.set_current = &bq24715_set_current,
-	.get_voltage = &bq24715_get_voltage,
-	.set_voltage = &bq24715_set_voltage,
-	.discharge_on_ac = &bq24715_discharge_on_ac,
-	.set_input_current_limit = &bq24715_set_input_current_limit,
-	.get_input_current_limit = &bq24715_get_input_current_limit,
-	.manufacturer_id = &bq24715_manufacturer_id,
-	.device_id = &bq24715_device_id,
-	.get_option = &bq24715_get_option,
-	.set_option = &bq24715_set_option,
-};