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

diff --git a/driver/mp2964.c b/driver/mp2964.c
deleted file mode 100644
index 21a23a8f4c..0000000000
--- a/driver/mp2964.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Copyright 2021 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.
- */
-
-/* Driver for tuning the MP2964 IMVP8 - IMVP9.1 parameters */
-
-#include "console.h"
-#include "i2c.h"
-#include "mp2964.h"
-#include "timer.h"
-#include "util.h"
-
-#define MP2964_STARTUP_WAIT_US		(50 * MSEC)
-#define MP2964_STORE_WAIT_US		(300 * MSEC)
-#define MP2964_RESTORE_WAIT_US		(2 * MSEC)
-
-enum reg_page {
-	REG_PAGE_0,
-	REG_PAGE_1,
-	REG_PAGE_COUNT
-};
-
-static int mp2964_write8(uint8_t reg, uint8_t value)
-{
-	const uint8_t tx[2] = { reg, value };
-
-	return i2c_xfer_unlocked(I2C_PORT_MP2964, I2C_ADDR_MP2964_FLAGS,
-				 tx, sizeof(tx), NULL, 0, I2C_XFER_SINGLE);
-}
-
-static void mp2964_read16(uint8_t reg, uint16_t *value)
-{
-	const uint8_t tx[1] = { reg };
-	uint8_t rx[2];
-
-	i2c_xfer_unlocked(I2C_PORT_MP2964, I2C_ADDR_MP2964_FLAGS,
-			  tx, sizeof(tx), rx, sizeof(rx), I2C_XFER_SINGLE);
-	*value = (rx[1] << 8) | rx[0];
-}
-
-static void mp2964_write16(uint8_t reg, uint16_t value)
-{
-	const uint8_t tx[3] = { reg, value & 0xff, value >> 8 };
-
-	i2c_xfer_unlocked(I2C_PORT_MP2964, I2C_ADDR_MP2964_FLAGS,
-			  tx, sizeof(tx), NULL, 0, I2C_XFER_SINGLE);
-}
-
-static int mp2964_select_page(enum reg_page page)
-{
-	int status;
-
-	if (page >= REG_PAGE_COUNT)
-		return EC_ERROR_INVAL;
-
-	status = mp2964_write8(MP2964_PAGE, page);
-	if (status != EC_SUCCESS) {
-		ccprintf("%s: could not select page 0x%02x, error %d\n",
-			 __func__, page, status);
-	}
-	return status;
-}
-
-static void mp2964_write_vec16(const struct mp2964_reg_val *init_list,
-			       int count, int *delta)
-{
-	const struct mp2964_reg_val *reg_val;
-	uint16_t outval;
-	int i;
-
-	reg_val = init_list;
-	for (i = 0; i < count; ++i, ++reg_val) {
-		mp2964_read16(reg_val->reg, &outval);
-		if (outval == reg_val->val) {
-			ccprintf("mp2964: reg 0x%02x already 0x%04x\n",
-				 reg_val->reg, outval);
-			continue;
-		}
-		ccprintf("mp2964: tuning reg 0x%02x from 0x%04x to 0x%04x\n",
-			 reg_val->reg, outval, reg_val->val);
-		mp2964_write16(reg_val->reg, reg_val->val);
-		*delta += 1;
-	}
-}
-
-static int mp2964_store_user_all(void)
-{
-	const uint8_t wr = MP2964_STORE_USER_ALL;
-	const uint8_t rd = MP2964_RESTORE_USER_ALL;
-	int status;
-
-	ccprintf("%s: updating persistent settings\n", __func__);
-
-	status = i2c_xfer_unlocked(I2C_PORT_MP2964, I2C_ADDR_MP2964_FLAGS,
-				   &wr, sizeof(wr), NULL, 0, I2C_XFER_SINGLE);
-	if (status != EC_SUCCESS)
-		return status;
-
-	usleep(MP2964_STORE_WAIT_US);
-
-	status = i2c_xfer_unlocked(I2C_PORT_MP2964, I2C_ADDR_MP2964_FLAGS,
-				   &rd, sizeof(rd), NULL, 0, I2C_XFER_SINGLE);
-	if (status != EC_SUCCESS)
-		return status;
-
-	usleep(MP2964_RESTORE_WAIT_US);
-
-	return EC_SUCCESS;
-}
-
-static void mp2964_patch_rail(enum reg_page page,
-			      const struct mp2964_reg_val *page_vals,
-			      int count,
-			      int *delta)
-{
-	if (mp2964_select_page(page) != EC_SUCCESS)
-		return;
-	mp2964_write_vec16(page_vals, count, delta);
-}
-
-int mp2964_tune(const struct mp2964_reg_val *rail_a, int count_a,
-		const struct mp2964_reg_val *rail_b, int count_b)
-{
-	int tries = 2;
-	int delta;
-
-	udelay(MP2964_STARTUP_WAIT_US);
-
-	i2c_lock(I2C_PORT_MP2964, 1);
-
-	do {
-		int status;
-
-		delta = 0;
-		mp2964_patch_rail(REG_PAGE_0, rail_a, count_a, &delta);
-		mp2964_patch_rail(REG_PAGE_1, rail_b, count_b, &delta);
-		if (delta == 0)
-			break;
-
-		status = mp2964_store_user_all();
-		if (status != EC_SUCCESS)
-			ccprintf("%s: STORE_USER_ALL failed\n", __func__);
-	} while (--tries > 0);
-
-	i2c_lock(I2C_PORT_MP2964, 0);
-
-	if (delta)
-		return EC_ERROR_UNKNOWN;
-	else
-		return EC_SUCCESS;
-}