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

diff --git a/common/pwm.c b/common/pwm.c
deleted file mode 100644
index 41989a94e0..0000000000
--- a/common/pwm.c
+++ /dev/null
@@ -1,180 +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.
- */
-
-#include "common.h"
-#include "console.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "host_command.h"
-#include "pwm.h"
-#include "util.h"
-
-#ifdef CONFIG_ZEPHYR
-#include "pwm/pwm.h"
-#endif
-
-#ifdef CONFIG_PWM
-
-/*
- * Get target channel based on type / index host command parameters.
- * Returns 0 if a valid channel is selected, -1 on error.
- */
-static int get_target_channel(enum pwm_channel *channel, int type, int index)
-{
-	switch (type) {
-	case EC_PWM_TYPE_GENERIC:
-		*channel = index;
-		break;
-#ifdef CONFIG_PWM_KBLIGHT
-	case EC_PWM_TYPE_KB_LIGHT:
-		*channel = PWM_CH_KBLIGHT;
-		break;
-#endif
-#ifdef CONFIG_PWM_DISPLIGHT
-	case EC_PWM_TYPE_DISPLAY_LIGHT:
-		*channel = PWM_CH_DISPLIGHT;
-		break;
-#endif
-	default:
-		return -1;
-	}
-
-	return *channel >= PWM_CH_COUNT;
-}
-
-__attribute__((weak)) void pwm_set_raw_duty(enum pwm_channel ch, uint16_t duty)
-{
-	int percent;
-
-	/* Convert 16 bit duty to percent on [0, 100] */
-	percent = DIV_ROUND_NEAREST((uint32_t)duty * 100, 65535);
-	pwm_set_duty(ch, percent);
-}
-
-__attribute__((weak)) uint16_t pwm_get_raw_duty(enum pwm_channel ch)
-{
-	return (pwm_get_duty(ch) * 65535) / 100;
-}
-
-static enum ec_status
-host_command_pwm_set_duty(struct host_cmd_handler_args *args)
-{
-	const struct ec_params_pwm_set_duty *p = args->params;
-	enum pwm_channel channel;
-
-	if (get_target_channel(&channel, p->pwm_type, p->index))
-		return EC_RES_INVALID_PARAM;
-
-	pwm_set_raw_duty(channel, p->duty);
-	pwm_enable(channel, p->duty > 0);
-
-	return EC_RES_SUCCESS;
-}
-DECLARE_HOST_COMMAND(EC_CMD_PWM_SET_DUTY,
-		     host_command_pwm_set_duty,
-		     EC_VER_MASK(0));
-
-static enum ec_status
-host_command_pwm_get_duty(struct host_cmd_handler_args *args)
-{
-	const struct ec_params_pwm_get_duty *p = args->params;
-	struct ec_response_pwm_get_duty *r = args->response;
-
-	enum pwm_channel channel;
-
-	if (get_target_channel(&channel, p->pwm_type, p->index))
-		return EC_RES_INVALID_PARAM;
-
-	r->duty = pwm_get_raw_duty(channel);
-	args->response_size = sizeof(*r);
-
-	return EC_RES_SUCCESS;
-}
-DECLARE_HOST_COMMAND(EC_CMD_PWM_GET_DUTY,
-		     host_command_pwm_get_duty,
-		     EC_VER_MASK(0));
-
-/**
- * Print status of a PWM channel.
- *
- * @param ch		Channel to print.
- */
-static void print_channel(enum pwm_channel ch, int max_duty)
-{
-	if (pwm_get_enabled(ch))
-		if (max_duty == 100)
-			ccprintf("  %d: %d%%\n", ch, pwm_get_duty(ch));
-		else
-			ccprintf("  %d: %d\n", ch, pwm_get_raw_duty(ch));
-	else
-		ccprintf("  %d: disabled\n", ch);
-}
-
-static int cc_pwm_duty(int argc, char **argv)
-{
-	int value = 0;
-	int max_duty = 100;
-	int ch;
-	char *e;
-	char *raw;
-
-	if (argc < 2) {
-		ccprintf("PWM channels:\n");
-		for (ch = 0; ch < PWM_CH_COUNT; ch++)
-			print_channel(ch, max_duty);
-		return EC_SUCCESS;
-	}
-
-	ch = strtoi(argv[1], &e, 0);
-	if (*e || ch < 0 || ch >= PWM_CH_COUNT)
-		return EC_ERROR_PARAM1;
-
-	if (argc > 2) {
-		raw = argv[2];
-		if (!strcasecmp(raw, "raw")) {
-			/* use raw duty */
-			value = strtoi(argv[3], &e, 0);
-			max_duty = EC_PWM_MAX_DUTY;
-		} else {
-			/* use percent duty */
-			value = strtoi(argv[2], &e, 0);
-			max_duty = 100;
-		}
-
-		if (*e || value > max_duty) {
-			/* Bad param */
-			return EC_ERROR_PARAM2;
-		} else if (value < 0) {
-			/* Negative = disable */
-			pwm_enable(ch, 0);
-		} else {
-			ccprintf("Setting channel %d to %d\n", ch, value);
-			pwm_enable(ch, 1);
-			(max_duty == 100) ? pwm_set_duty(ch, value) :
-				pwm_set_raw_duty(ch, value);
-		}
-	}
-
-	print_channel(ch, max_duty);
-
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(pwmduty, cc_pwm_duty,
-			"[channel [<percent> | -1=disable] | [raw <value>]]",
-			"Get/set PWM duty cycles ");
-#endif /* CONFIG_PWM */
-
-#ifndef CONFIG_ZEPHYR
-/*
- * Initialize all PWM pins as functional.  This is not required under
- * Zephyr as pin configuration is automatically performed by chip driver
- */
-static void pwm_pin_init(void)
-{
-	gpio_config_module(MODULE_PWM, 1);
-}
-/* HOOK_PRIO_INIT_PWM may be used for chip PWM unit init, so use PRIO + 1 */
-DECLARE_HOOK(HOOK_INIT, pwm_pin_init, HOOK_PRIO_INIT_PWM + 1);
-#endif /* CONFIG_ZEPHYR */