Revert "Merge remote-tracking branch cros/main into factory-brya-14517.B-main"factory-brya-14517.B-main

This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48.

Reason for revert: broken build due to ec-utils.

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14517.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
>
> Relevant changes:
>
> git log --oneline 54462f034b..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
> BUG=b:163093572 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
> Signed-off-by: YH Lin <yueherngl@google.com>

Bug: b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
Bug: b:163093572 b:254328661
Change-Id: I48d5aa4cc67a69ee1f6ac9255ac3087d34da4c72
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077248
Tested-by: YH Lin <yueherngl@chromium.org>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Auto-Submit: YH Lin <yueherngl@chromium.org>

1 files changed, 0 insertions, 181 deletions

diff --git a/zephyr/program/corsola/src/kingler/led_steelix.c b/zephyr/program/corsola/src/kingler/led_steelix.c
deleted file mode 100644
index 1188c4f95e..0000000000
--- a/zephyr/program/corsola/src/kingler/led_steelix.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Battery LED control for Steelix
- */
-
-#include "board_led.h"
-#include "common.h"
-#include "cros_cbi.h"
-#include "led_common.h"
-#include "led_onoff_states.h"
-#include "util.h"
-
-#include <zephyr/drivers/pwm.h>
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(board_led, LOG_LEVEL_ERR);
-
-#define BOARD_LED_PWM_PERIOD_NS BOARD_LED_HZ_TO_PERIOD_NS(100)
-
-static const struct board_led_pwm_dt_channel board_led_battery_red =
-	BOARD_LED_PWM_DT_CHANNEL_INITIALIZER(DT_NODELABEL(led_battery_red));
-static const struct board_led_pwm_dt_channel board_led_battery_green =
-	BOARD_LED_PWM_DT_CHANNEL_INITIALIZER(DT_NODELABEL(led_battery_green));
-static const struct board_led_pwm_dt_channel board_led_power_white =
-	BOARD_LED_PWM_DT_CHANNEL_INITIALIZER(DT_NODELABEL(led_power_white));
-
-__override const int led_charge_lvl_1 = 5;
-__override const int led_charge_lvl_2 = 97;
-__override struct led_descriptor
-	led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = {
-		[STATE_CHARGING_LVL_1] = { { EC_LED_COLOR_RED,
-					     LED_INDEFINITE } },
-		[STATE_CHARGING_LVL_2] = { { EC_LED_COLOR_AMBER,
-					     LED_INDEFINITE } },
-		[STATE_CHARGING_FULL_CHARGE] = { { EC_LED_COLOR_GREEN,
-						   LED_INDEFINITE } },
-		[STATE_DISCHARGE_S0] = { { LED_OFF, LED_INDEFINITE } },
-		[STATE_DISCHARGE_S0_BAT_LOW] = { { LED_OFF, LED_INDEFINITE } },
-		[STATE_DISCHARGE_S3] = { { LED_OFF, LED_INDEFINITE } },
-		[STATE_DISCHARGE_S5] = { { LED_OFF, LED_INDEFINITE } },
-		[STATE_BATTERY_ERROR] = { { EC_LED_COLOR_RED, 1 * LED_ONE_SEC },
-					  { LED_OFF, 1 * LED_ONE_SEC } },
-		[STATE_FACTORY_TEST] = { { EC_LED_COLOR_RED, 2 * LED_ONE_SEC },
-					 { EC_LED_COLOR_GREEN,
-					   2 * LED_ONE_SEC } },
-	};
-
-__override const struct led_descriptor
-	led_pwr_state_table[PWR_LED_NUM_STATES][LED_NUM_PHASES] = {
-		[PWR_LED_STATE_ON] = { { EC_LED_COLOR_WHITE, LED_INDEFINITE } },
-		[PWR_LED_STATE_SUSPEND_AC] = { { EC_LED_COLOR_WHITE,
-						 3 * LED_ONE_SEC },
-					       { LED_OFF, 0.5 * LED_ONE_SEC } },
-		[PWR_LED_STATE_SUSPEND_NO_AC] = { { EC_LED_COLOR_WHITE,
-						    3 * LED_ONE_SEC },
-						  { LED_OFF,
-						    0.5 * LED_ONE_SEC } },
-		[PWR_LED_STATE_OFF] = { { LED_OFF, LED_INDEFINITE } },
-	};
-
-const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_BATTERY_LED,
-	EC_LED_ID_POWER_LED,
-};
-
-const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
-
-static void board_led_pwm_set_duty(const struct board_led_pwm_dt_channel *ch,
-				   int percent)
-{
-	uint32_t pulse_ns;
-	int rv;
-
-	if (!device_is_ready(ch->dev)) {
-		LOG_ERR("PWM device %s not ready", ch->dev->name);
-		return;
-	}
-
-	pulse_ns = DIV_ROUND_NEAREST(BOARD_LED_PWM_PERIOD_NS * percent, 100);
-
-	LOG_DBG("Board LED PWM %s set percent (%d), pulse %d", ch->dev->name,
-		percent, pulse_ns);
-
-	rv = pwm_set(ch->dev, ch->channel, BOARD_LED_PWM_PERIOD_NS, pulse_ns,
-		     ch->flags);
-	if (rv) {
-		LOG_ERR("pwm_set() failed %s (%d)", ch->dev->name, rv);
-	}
-}
-
-static bool device_is_clamshell(void)
-{
-	int ret;
-	uint32_t val;
-
-	ret = cros_cbi_get_fw_config(FORM_FACTOR, &val);
-	if (ret != 0) {
-		LOG_ERR("Error retrieving CBI FW_CONFIG field %d", FORM_FACTOR);
-		return false;
-	}
-
-	return val == CLAMSHELL;
-}
-
-__override void led_set_color_battery(enum ec_led_colors color)
-{
-	switch (color) {
-	case EC_LED_COLOR_RED:
-		board_led_pwm_set_duty(&board_led_battery_red, 100);
-		board_led_pwm_set_duty(&board_led_battery_green, 0);
-		break;
-	case EC_LED_COLOR_GREEN:
-		board_led_pwm_set_duty(&board_led_battery_red, 0);
-		board_led_pwm_set_duty(&board_led_battery_green, 100);
-		break;
-	case EC_LED_COLOR_AMBER:
-		board_led_pwm_set_duty(&board_led_battery_red, 100);
-		board_led_pwm_set_duty(&board_led_battery_green, 20);
-		break;
-	default: /* LED_OFF and other unsupported colors */
-		board_led_pwm_set_duty(&board_led_battery_red, 0);
-		board_led_pwm_set_duty(&board_led_battery_green, 0);
-		break;
-	}
-}
-
-__override void led_set_color_power(enum ec_led_colors color)
-{
-	if (device_is_clamshell()) {
-		board_led_pwm_set_duty(&board_led_power_white, 0);
-	} else {
-		switch (color) {
-		case EC_LED_COLOR_WHITE:
-			board_led_pwm_set_duty(&board_led_power_white, 100);
-			break;
-		default:
-			board_led_pwm_set_duty(&board_led_power_white, 0);
-			break;
-		}
-	}
-}
-
-void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
-{
-	if (led_id == EC_LED_ID_BATTERY_LED) {
-		brightness_range[EC_LED_COLOR_RED] = 1;
-		brightness_range[EC_LED_COLOR_GREEN] = 1;
-		brightness_range[EC_LED_COLOR_AMBER] = 1;
-	} else if (led_id == EC_LED_ID_POWER_LED) {
-		if (device_is_clamshell()) {
-			brightness_range[EC_LED_COLOR_WHITE] = 0;
-		} else {
-			brightness_range[EC_LED_COLOR_WHITE] = 1;
-		}
-	}
-}
-
-int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
-{
-	if (led_id == EC_LED_ID_BATTERY_LED) {
-		if (brightness[EC_LED_COLOR_RED] != 0) {
-			led_set_color_battery(EC_LED_COLOR_RED);
-		} else if (brightness[EC_LED_COLOR_GREEN] != 0) {
-			led_set_color_battery(EC_LED_COLOR_GREEN);
-		} else if (brightness[EC_LED_COLOR_AMBER] != 0) {
-			led_set_color_battery(EC_LED_COLOR_AMBER);
-		} else {
-			led_set_color_battery(LED_OFF);
-		}
-	} else if (led_id == EC_LED_ID_POWER_LED) {
-		if (brightness[EC_LED_COLOR_WHITE] != 0) {
-			led_set_color_power(EC_LED_COLOR_WHITE);
-		} else {
-			led_set_color_power(LED_OFF);
-		}
-	}
-
-	return EC_SUCCESS;
-}