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

diff --git a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
deleted file mode 100644
index 94632947c6..0000000000
--- a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
+++ /dev/null
@@ -1,450 +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.
- */
-
-#define DT_DRV_COMPAT nxp_rtc_pcf85063a
-
-#include <assert.h>
-#include <device.h>
-#include <drivers/cros_rtc.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <rtc.h>
-#include <soc.h>
-
-#include "nxp_rtc_pcf85063a.h"
-
-#include <logging/log.h>
-LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR);
-
-/* Driver config */
-struct nxp_rtc_pcf85063a_config {
-	const struct device *bus;
-	const uint16_t i2c_addr_flags;
-	const struct gpio_dt_spec gpio_alert;
-};
-
-/* Driver data */
-struct nxp_rtc_pcf85063a_data {
-	const struct device *dev;
-	uint8_t time_reg[NUM_TIMER_REGS];
-	struct gpio_callback gpio_cb;
-	cros_rtc_alarm_callback_t alarm_callback;
-};
-
-/* Driver convenience defines */
-#define DRV_CONFIG(dev) ((const struct nxp_rtc_pcf85063a_config *)(dev)->config)
-#define DRV_DATA(dev) ((struct nxp_rtc_pcf85063a_data *)(dev)->data)
-
-/*
- * is_alarm == true: Reads alarm registers SECONDS, MINUTES, HOURS, and DAYS
- * is_alarm == false: Reads time registers SECONDS, MINUTES, HOURS, DAYS, and
- *			MONTHS, YEARS
- */
-static int pcf85063a_read_time_regs(const struct device *dev, bool is_alarm)
-{
-	const struct nxp_rtc_pcf85063a_config *const config = DRV_CONFIG(dev);
-	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
-	uint8_t start_reg;
-	uint8_t num_reg;
-
-	if (is_alarm) {
-		start_reg = REG_SECOND_ALARM;
-		num_reg = NUM_ALARM_REGS;
-	} else {
-		start_reg = REG_SECONDS;
-		num_reg = NUM_TIMER_REGS;
-	}
-
-	return i2c_burst_read(config->bus,
-		config->i2c_addr_flags, start_reg, data->time_reg, num_reg);
-}
-
-static int pcf85063a_read_reg(const struct device *dev,
-						uint8_t reg, uint8_t *val)
-{
-	const struct nxp_rtc_pcf85063a_config *const config = DRV_CONFIG(dev);
-
-	return i2c_reg_read_byte(config->bus, config->i2c_addr_flags, reg, val);
-}
-
-/*
- * is_alarm == true: Writes alarm registers SECONDS, MINUTES, HOURS, and DAYS
- * is_alarm == false: Writes time registers SECONDS, MINUTES, HOURS, DAYS, and
- *			MONTHS, YEARS
- */
-static int pcf85063a_write_time_regs(const struct device *dev, bool is_alarm)
-{
-	const struct nxp_rtc_pcf85063a_config *const config = DRV_CONFIG(dev);
-	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
-	uint8_t tx_buf[NUM_TIMER_REGS];
-	uint8_t start_reg;
-	uint8_t num_reg;
-
-	if (is_alarm) {
-		start_reg = REG_SECOND_ALARM;
-		num_reg = NUM_ALARM_REGS;
-	} else {
-		start_reg = REG_SECONDS;
-		num_reg = NUM_TIMER_REGS;
-	}
-
-	for (int i = 0; i < num_reg; i++) {
-		tx_buf[i] = data->time_reg[i];
-	}
-
-	return i2c_burst_write(config->bus,
-			config->i2c_addr_flags, start_reg, tx_buf, num_reg);
-}
-
-
-static int pcf85063a_write_reg(const struct device *dev,
-						uint8_t reg, uint8_t val)
-{
-	const struct nxp_rtc_pcf85063a_config *const config = DRV_CONFIG(dev);
-	uint8_t tx_buf[2];
-
-	tx_buf[0] = reg;
-	tx_buf[1] = val;
-
-	return i2c_write(config->bus,
-		tx_buf, sizeof(tx_buf), config->i2c_addr_flags);
-}
-
-/*
- * val bits 7 to 4 - tens place
- * val bits 3 to 0 - ones place
- */
-static int bcd_to_dec(uint8_t val, enum bcd_mask mask)
-{
-	int tens = ((val & mask) >> 4) * 10;
-	int ones = (val & 0xf);
-
-	return tens + ones;
-}
-
-/*
- * val bits 7 to 4 - tens place
- * val bits 3 to 0 - ones place
- */
-static uint8_t dec_to_bcd(uint32_t val, enum bcd_mask mask)
-{
-	int tens = val / 10;
-	int ones = val - (tens * 10);
-
-	return ((tens << 4) & mask) | ones;
-}
-
-static int nxp_rtc_pcf85063a_read_seconds(const struct device *dev,
-					uint32_t *value, bool is_alarm)
-{
-	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
-	struct calendar_date time;
-	int ret;
-
-	ret = pcf85063a_read_time_regs(dev, is_alarm);
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	if (is_alarm) {
-		*value = (bcd_to_dec(data->time_reg[DAYS], DAYS_MASK) *
-				SECS_PER_DAY) +
-			(bcd_to_dec(data->time_reg[HOURS], HOURS24_MASK) *
-				SECS_PER_HOUR) +
-			(bcd_to_dec(data->time_reg[MINUTES], MINUTES_MASK) *
-				SECS_PER_MINUTE) +
-			bcd_to_dec(data->time_reg[SECONDS], SECONDS_MASK);
-	} else {
-		time.year = bcd_to_dec(data->time_reg[YEARS], YEARS_MASK);
-		time.month =
-			bcd_to_dec(data->time_reg[MONTHS], MONTHS_MASK);
-		time.day = bcd_to_dec(data->time_reg[DAYS], DAYS_MASK);
-
-		*value = date_to_sec(time) - SECS_TILL_YEAR_2K +
-			(bcd_to_dec(data->time_reg[HOURS], HOURS24_MASK) *
-				SECS_PER_HOUR) +
-			(bcd_to_dec(data->time_reg[MINUTES], MINUTES_MASK) *
-				SECS_PER_MINUTE) +
-			bcd_to_dec(data->time_reg[SECONDS], SECONDS_MASK);
-	}
-
-	return ret;
-}
-
-static int nxp_rtc_pcf85063a_write_seconds(const struct device *dev,
-				uint32_t value, bool is_alarm)
-{
-	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
-	struct calendar_date time;
-	uint32_t tmp_sec;
-
-	time = sec_to_date(value + SECS_TILL_YEAR_2K);
-
-	if (!is_alarm) {
-		data->time_reg[YEARS] = dec_to_bcd(time.year, YEARS_MASK);
-		data->time_reg[MONTHS] =
-				dec_to_bcd(time.month, MONTHS_MASK);
-	}
-
-	data->time_reg[DAYS] = dec_to_bcd(time.day, DAYS_MASK);
-
-	if (is_alarm && data->time_reg[DAYS] == 0) {
-		data->time_reg[DAYS] |= DISABLE_ALARM;
-	}
-
-	value %= SECS_PER_DAY;
-	tmp_sec = value / SECS_PER_HOUR;
-	data->time_reg[HOURS] = dec_to_bcd(tmp_sec, HOURS24_MASK);
-
-	if (is_alarm && data->time_reg[HOURS] == 0) {
-		data->time_reg[HOURS] |= DISABLE_ALARM;
-	}
-
-	value -= (tmp_sec * SECS_PER_HOUR);
-	tmp_sec = value / SECS_PER_MINUTE;
-	data->time_reg[MINUTES] = dec_to_bcd(tmp_sec, MINUTES_MASK);
-
-	if (is_alarm && data->time_reg[MINUTES] == 0) {
-		data->time_reg[MINUTES] |= DISABLE_ALARM;
-	}
-
-	value -= (tmp_sec * SECS_PER_MINUTE);
-	data->time_reg[SECONDS] = dec_to_bcd(value, SECONDS_MASK);
-
-	if (is_alarm && data->time_reg[SECONDS] == 0) {
-		data->time_reg[SECONDS] |= DISABLE_ALARM;
-	}
-
-	return pcf85063a_write_time_regs(dev, is_alarm);
-}
-
-static int nxp_rtc_pcf85063a_configure(const struct device *dev,
-				   cros_rtc_alarm_callback_t callback)
-{
-	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
-
-	if (callback == NULL) {
-		return -EINVAL;
-	}
-
-	data->alarm_callback = callback;
-
-	return 0;
-}
-
-static int nxp_rtc_pcf85063a_get_value(const struct device *dev,
-							uint32_t *value)
-{
-	return nxp_rtc_pcf85063a_read_seconds(dev, value, false);
-}
-
-static int nxp_rtc_pcf85063a_set_value(const struct device *dev, uint32_t value)
-{
-	return nxp_rtc_pcf85063a_write_seconds(dev, value, false);
-}
-
-static int nxp_rtc_pcf85063a_get_alarm(const struct device *dev,
-			uint32_t *seconds, uint32_t *microseconds)
-{
-	*microseconds = 0;
-	return nxp_rtc_pcf85063a_read_seconds(dev, seconds, true);
-}
-
-static int nxp_rtc_pcf85063a_reset_alarm(const struct device *dev)
-{
-	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
-	int ret;
-
-	/* Disable alarm interrupt and clear pending alarm flag */
-	ret = pcf85063a_write_reg(dev, REG_CONTROL_2, 0);
-	if (ret < 0) {
-		return ret;
-	}
-
-	/* Clear and disable the alarm registers */
-	data->time_reg[SECONDS] = DISABLE_ALARM;
-	data->time_reg[MINUTES] = DISABLE_ALARM;
-	data->time_reg[HOURS] = DISABLE_ALARM;
-	data->time_reg[DAYS] = DISABLE_ALARM;
-
-	return pcf85063a_write_time_regs(dev, true);
-}
-
-static int nxp_rtc_pcf85063a_set_alarm(const struct device *dev,
-			uint32_t seconds, uint32_t microseconds)
-{
-	int ret;
-
-	ARG_UNUSED(microseconds);
-
-	ret = nxp_rtc_pcf85063a_reset_alarm(dev);
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = nxp_rtc_pcf85063a_write_seconds(dev, seconds, true);
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return pcf85063a_write_reg(dev, REG_CONTROL_2, ENABLE_ALARM_INTERRUPT);
-}
-
-static void nxp_pcf85063a_isr(const struct device *port,
-				struct gpio_callback *cb, uint32_t pin)
-{
-	struct nxp_rtc_pcf85063a_data *data =
-		CONTAINER_OF(cb, struct nxp_rtc_pcf85063a_data, gpio_cb);
-	const struct device *dev = (const struct device *)data->dev;
-
-	ARG_UNUSED(port);
-	ARG_UNUSED(pin);
-	ARG_UNUSED(cb);
-
-	LOG_DBG("%s", __func__);
-
-	/* Call callback function */
-	if (data->alarm_callback) {
-		data->alarm_callback(dev);
-	}
-}
-
-static const struct cros_rtc_driver_api nxp_rtc_pcf85063a_driver_api = {
-	.configure = nxp_rtc_pcf85063a_configure,
-	.get_value = nxp_rtc_pcf85063a_get_value,
-	.set_value = nxp_rtc_pcf85063a_set_value,
-	.get_alarm = nxp_rtc_pcf85063a_get_alarm,
-	.set_alarm = nxp_rtc_pcf85063a_set_alarm,
-	.reset_alarm = nxp_rtc_pcf85063a_reset_alarm,
-};
-
-static int nxp_rtc_pcf85063a_init(const struct device *dev)
-{
-	const struct nxp_rtc_pcf85063a_config *const config = DRV_CONFIG(dev);
-	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
-	uint8_t val;
-	int ret;
-
-	if (!device_is_ready(config->bus)) {
-		LOG_ERR("Device %s is not ready", config->bus->name);
-		return -ENODEV;
-	}
-
-	/*
-	 * Read Control_1 register. For normal operation,
-	 * the values should be as follows:
-	 *	Bit 7 (external clock test mode)    : (0) normal mode
-	 *	Bit 6 (unused)                      : (0)
-	 *	Bit 5 (STOP bit)                    : (0) RTC clock runs
-	 *	BIT 4 (software reset)              : (0) no software reset
-	 *	BIT 3 (unused)                      : (0)
-	 *	BIT 2 (correction interrupt enable) : (0) no correction
-	 *	                                          interrupt generated
-	 *	BIT 1 (12 or 24-hour mode)          : (0) 24-hour mode
-	 *	BIT 0 (internal oscillator capacitor: (0) 7pF
-	 */
-	ret = pcf85063a_read_reg(dev, REG_CONTROL_1, &val);
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	if (val != CONTROL_1_DEFAULT_VALUE) {
-		/* PCF85063A is not initialized, so send soft reset */
-		ret = pcf85063a_write_reg(dev, REG_CONTROL_1, SOFT_RESET);
-
-		if (ret < 0) {
-			return ret;
-		}
-	}
-
-	/*
-	 * Read Seconds register and check if oscillator is stopped.
-	 * If so, clear the bit.
-	 */
-	ret = pcf85063a_read_reg(dev, REG_SECONDS, &val);
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	if (val & OS_BIT) {
-		/* Oscillator stop bit is set, clear it. */
-		val &= ~OS_BIT;
-		ret = pcf85063a_write_reg(dev, REG_SECONDS, val);
-
-		if (ret < 0) {
-			return ret;
-		}
-	}
-
-	nxp_rtc_pcf85063a_reset_alarm(dev);
-
-	/* Configure GPIO interrupt pin for PCF85063A alarm pin */
-
-	if (!device_is_ready(config->gpio_alert.port)) {
-		LOG_ERR("Alert GPIO device not ready");
-		return -ENODEV;
-	}
-
-	ret = gpio_pin_configure_dt(&config->gpio_alert, GPIO_INPUT);
-
-	if (ret < 0) {
-		LOG_ERR("Could not configure RTC alert pin");
-		return ret;
-	}
-
-	gpio_init_callback(&data->gpio_cb,
-			nxp_pcf85063a_isr, BIT(config->gpio_alert.pin));
-
-	ret = gpio_add_callback(config->gpio_alert.port, &data->gpio_cb);
-
-	if (ret < 0) {
-		LOG_ERR("Could not set RTC alert pin callback");
-		return ret;
-	}
-
-	data->dev = dev;
-
-	return gpio_pin_interrupt_configure_dt(&config->gpio_alert,
-					       GPIO_INT_EDGE_FALLING);
-}
-
-#define PCF85063A_INT_GPIOS \
-	DT_PHANDLE_BY_IDX(DT_NODELABEL(pcf85063a), int_gpios, 0)
-
-/*
- * dt_flags is a uint8_t type.  However, for platform/ec
- * the GPIO flags in the devicetree are expanded past 8 bits
- * to support the INPUT/OUTPUT and PULLUP/PULLDOWN properties.
- * Cast back to a gpio_dt_flags to compile, discarding the bits
- * that are not supported by the Zephyr GPIO API.
- */
-#define CROS_EC_GPIO_DT_SPEC_GET_BY_IDX(node_id, prop, idx)                \
-	{                                                                  \
-		.port =                                                    \
-		DEVICE_DT_GET(DT_GPIO_CTLR_BY_IDX(node_id, prop, idx)),    \
-		.pin = DT_GPIO_PIN_BY_IDX(node_id, prop, idx),             \
-		.dt_flags =                                                \
-		(gpio_dt_flags_t)DT_GPIO_FLAGS_BY_IDX(node_id, prop, idx), \
-	}
-
-static const struct nxp_rtc_pcf85063a_config nxp_rtc_pcf85063a_cfg_0 = {
-	.bus = DEVICE_DT_GET(DT_INST_BUS(0)),
-	.i2c_addr_flags = DT_INST_REG_ADDR(0),
-	.gpio_alert =
-		CROS_EC_GPIO_DT_SPEC_GET_BY_IDX(PCF85063A_INT_GPIOS, gpios, 0)
-};
-
-static struct nxp_rtc_pcf85063a_data nxp_rtc_pcf85063a_data_0;
-
-DEVICE_DT_INST_DEFINE(0, nxp_rtc_pcf85063a_init, /* pm_control_fn= */ NULL,
-		      &nxp_rtc_pcf85063a_data_0, &nxp_rtc_pcf85063a_cfg_0,
-		      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
-		      &nxp_rtc_pcf85063a_driver_api);