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

diff --git a/driver/charger/isl9241.h b/driver/charger/isl9241.h
deleted file mode 100644
index 0e5acd09df..0000000000
--- a/driver/charger/isl9241.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright 2019 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.
- *
- * Renesas (Intersil) ISL-9241 battery charger driver header.
- */
-
-#ifndef __CROS_EC_ISL9241_H
-#define __CROS_EC_ISL9241_H
-
-#include "driver/charger/isl9241_public.h"
-
-#define CHARGER_NAME	"ISL9241"
-#define CHARGE_V_MAX	18304
-#define CHARGE_V_MIN	64
-#define CHARGE_V_STEP	8
-#define CHARGE_I_MAX	6140
-#define CHARGE_I_MIN	4
-#define CHARGE_I_STEP	4
-#define INPUT_I_MAX	6140
-#define INPUT_I_MIN	4
-#define	INPUT_I_STEP	4
-
-/* Registers */
-
-/*
- * ChargeCurrentLimit [12:2] 11-bit (0x0000h = disables fast charging,
- * trickle charging is allowed)
- */
-#define ISL9241_REG_CHG_CURRENT_LIMIT	0x14
-
-/* MaxSystemVoltage [14:3] 12-bit, (0x0000h = disables switching) */
-#define ISL9241_REG_MAX_SYSTEM_VOLTAGE	0x15
-
-#define ISL9241_REG_CONTROL7		0x38
-
-/* Configures various charger options */
-#define ISL9241_REG_CONTROL0		0x39
-/* 2: Input Voltage Regulation (0 = Enable (default), 1 = Disable) */
-#define ISL9241_CONTROL0_INPUT_VTG_REGULATION	BIT(2)
-
-
-#define ISL9241_REG_INFORMATION1	0x3A
-#define ISL9241_REG_ADAPTER_CUR_LIMIT2	0x3B
-
-/* Configures various charger options */
-#define ISL9241_REG_CONTROL1		0x3C
-#define ISL9241_CONTROL1_PSYS		BIT(3)
-#define ISL9241_CONTROL1_LEARN_MODE	BIT(12)
-/*
- * 9:7 - Switching Frequency
- */
-#define ISL9241_CONTROL1_SWITCHING_FREQ_MASK 0x380
-#define ISL9241_CONTROL1_SWITCHING_FREQ_1420KHZ 0
-#define ISL9241_CONTROL1_SWITCHING_FREQ_1180KHZ 1
-#define ISL9241_CONTROL1_SWITCHING_FREQ_1020KHZ 2
-#define ISL9241_CONTROL1_SWITCHING_FREQ_890KHZ  3
-#define ISL9241_CONTROL1_SWITCHING_FREQ_808KHZ  4
-#define ISL9241_CONTROL1_SWITCHING_FREQ_724KHZ  5
-#define ISL9241_CONTROL1_SWITCHING_FREQ_656KHZ  6
-#define ISL9241_CONTROL1_SWITCHING_FREQ_600KHZ  7
-
-/* Configures various charger options */
-#define ISL9241_REG_CONTROL2		0x3D
-/*
- * 15:13 - Trickle Charging Current
- *         <000> 32mA (do not use)
- *         <001> 64mA
- *         <010> 96mA
- *         <011> 128mA (default)
- *         <100> 160mA
- *         <101> 192mA
- *         <110> 224mA
- *         <111> 256mA
- */
-#define ISL9241_CONTROL2_TRICKLE_CHG_CURR(curr)	((((curr) >> 5) - 1) << 13)
-/* 12 - Two-Level Adapter Current Limit */
-#define ISL9241_CONTROL2_TWO_LEVEL_ADP_CURR	BIT(12)
-/* 10:9 PROCHOT# debounce time in uS */
-#define ISL9241_CONTROL2_PROCHOT_DEBOUNCE_MASK  GENMASK(10, 9)
-#define ISL9241_CONTROL2_PROCHOT_DEBOUNCE_500	(2 << 9)
-#define ISL9241_CONTROL2_PROCHOT_DEBOUNCE_1000	(3 << 9)
-
-/* MinSystemVoltage [13:6] 8-bit (0x0000h = disables all battery charging) */
-#define ISL9241_REG_MIN_SYSTEM_VOLTAGE	0x3E
-
-#define ISL9241_REG_ADAPTER_CUR_LIMIT1	0x3F
-#define ISL9241_REG_ACOK_REFERENCE	0x40
-#define ISL9241_REG_CONTROL6		0x43
-#define ISL9241_REG_AC_PROCHOT		0x47
-#define ISL9241_REG_DC_PROCHOT		0x48
-#define ISL9241_REG_OTG_VOLTAGE		0x49
-#define ISL9241_REG_OTG_CURRENT		0x4A
-
-/* VIN Voltage (ADP Min Voltage) (default 4.096V) */
-#define ISL9241_REG_VIN_VOLTAGE		0x4B
-
-/* Configures various charger options */
-#define ISL9241_REG_CONTROL3		0x4C
-/* 14: ACLIM Reload (0 - reload, 1 - Do not reload */
-#define ISL9241_CONTROL3_ACLIM_RELOAD	BIT(14)
-/* 2: Digital Reset (0 - Idle, 1 - Reset */
-#define ISL9241_CONTROL3_DIGITAL_RESET	BIT(2)
-/* 0: Enable ADC (0 - Active when charging, 1 - Active always) */
-#define ISL9241_CONTROL3_ENABLE_ADC	BIT(0)
-
-/* Indicates various charger status */
-#define ISL9241_REG_INFORMATION2	0x4D
-/* 12: BATGONE pin status (0 = Battery is present, 1 = No battery) */
-#define ISL9241_INFORMATION2_BATGONE_PIN	BIT(12)
-/* 14: ACOK pin status (0 = No adapter, 1 = Adapter is present) */
-#define ISL9241_INFORMATION2_ACOK_PIN		BIT(14)
-
-#define ISL9241_REG_CONTROL4		0x4E
-/* 11: Rsense (Rs1:Rs2) ratio for PSYS (0 - 2:1, 1 - 1:1) */
-#define ISL9241_CONTROL4_PSYS_RSENSE_RATIO  BIT(11)
-/* 13: Enable VSYS slew rate control (0 - disable, 1 - enable) */
-#define ISL9241_CONTROL4_SLEW_RATE_CTRL     BIT(13)
-
-#define ISL9241_REG_CONTROL5		0x4F
-#define ISL9241_REG_NTC_ADC_RESULTS	0x80
-#define ISL9241_REG_VBAT_ADC_RESULTS	0x81
-#define ISL9241_REG_TJ_ADC_RESULTS	0x82
-
-/* ADC result for adapter current measurements, LSB = 22.2mA */
-#define ISL9241_REG_IADP_ADC_RESULTS	0x83
-
-#define ISL9241_REG_DC_ADC_RESULTS	0x84
-#define ISL9241_REG_CC_ADC_RESULTS	0x85
-#define ISL9241_REG_VSYS_ADC_RESULTS	0x86
-#define ISL9241_REG_VIN_ADC_RESULTS	0x87
-#define ISL9241_REG_INFORMATION3	0x90
-#define ISL9241_REG_INFORMATION4	0x91
-#define ISL9241_REG_MANUFACTURER_ID	0xFE
-#define ISL9241_REG_DEVICE_ID		0xFF
-
-#define ISL9241_VIN_ADC_BIT_OFFSET	6
-#define ISL9241_VIN_ADC_STEP_MV		96
-
-#endif /* __CROS_EC_ISL9241_H */