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

diff --git a/common/inductive_charging.c b/common/inductive_charging.c
deleted file mode 100644
index 793f535afe..0000000000
--- a/common/inductive_charging.c
+++ /dev/null
@@ -1,107 +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.
- */
-
-/* Inductive charging control */
-
-#include "common.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "inductive_charging.h"
-#include "lid_switch.h"
-#include "timer.h"
-
-/*
- * The inductive charger is controlled with two signals:
- *   - BASE_CHG_VDD_EN controls whether the charger is powered.
- *   - CHARGE_EN controls whether to enable charging.
- * Charging status is reported via CHARGE_DONE, but in a tricky way:
- *   - It's 0 if:
- *     + The charger is unpowered. (i.e. BASE_CHG_VDD_EN = 0)
- *     + Or charging is disabled. (i.e. CHARGE_EN = 0)
- *     + Or the charging current is small enough.
- *   - Otherwise, it's 1.
- */
-
-/* Whether we want to process interrupts on CHARGE_DONE or not. */
-static int monitor_charge_done;
-
-/*
- * Start monitoring CHARGE_DONE and fires the interrupt once so that
- * we react to the current value.
- */
-static void inductive_charging_monitor_charge(void)
-{
-	monitor_charge_done = 1;
-	inductive_charging_interrupt(GPIO_CHARGE_DONE);
-}
-DECLARE_DEFERRED(inductive_charging_monitor_charge);
-
-void inductive_charging_interrupt(enum gpio_signal signal)
-{
-	int charger_enabled = gpio_get_level(GPIO_BASE_CHG_VDD_EN);
-	int charge_done = gpio_get_level(GPIO_CHARGE_DONE);
-	static int charge_already_done;
-
-	if (!monitor_charge_done && signal == GPIO_CHARGE_DONE)
-		return;
-
-	if (signal == GPIO_LID_OPEN) {
-		/* The lid has been opened. Clear all states. */
-		charge_done = 0;
-		charge_already_done = 0;
-		monitor_charge_done = 0;
-	} else if (signal == GPIO_CHARGE_DONE) {
-		/*
-		 * Once we see CHARGE_DONE=1, we ignore any change on
-		 * CHARGE_DONE until the next time the lid is opened.
-		 */
-		if (charge_done == 1)
-			charge_already_done = 1;
-		else if (charge_already_done)
-			return;
-	}
-
-	if (!charger_enabled || charge_done) {
-		gpio_set_level(GPIO_CHARGE_EN, 0);
-	} else {
-		gpio_set_level(GPIO_CHARGE_EN, 1);
-		/*
-		 * When the charging is just enabled, there might be a
-		 * blip on CHARGE_DONE. Wait for a second before we start
-		 * looking at CHARGE_DONE.
-		 */
-		if (!monitor_charge_done)
-			hook_call_deferred(
-				&inductive_charging_monitor_charge_data,
-				SECOND);
-	}
-}
-
-static void inductive_charging_deferred_update(void)
-{
-	int lid_open = lid_is_open();
-	gpio_set_level(GPIO_BASE_CHG_VDD_EN, !lid_open);
-	inductive_charging_interrupt(GPIO_LID_OPEN);
-}
-DECLARE_DEFERRED(inductive_charging_deferred_update);
-
-static void inductive_charging_lid_update(void)
-{
-	/*
-	 * When the lid close signal changes, the coils might still be
-	 * unaligned. Delay here to give the coils time to align before
-	 * we try to clear CHARGE_DONE.
-	 */
-	hook_call_deferred(&inductive_charging_deferred_update_data,
-			   5 * SECOND);
-}
-DECLARE_HOOK(HOOK_LID_CHANGE, inductive_charging_lid_update, HOOK_PRIO_DEFAULT);
-
-static void inductive_charging_init(void)
-{
-	gpio_enable_interrupt(GPIO_CHARGE_DONE);
-	inductive_charging_lid_update();
-}
-DECLARE_HOOK(HOOK_INIT, inductive_charging_init, HOOK_PRIO_DEFAULT);