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

This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687.

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

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
>
> Relevant changes:
>
> git log --oneline 19d4d68ffa..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:260630630 b:163093572 b:259002141 b:255184961 b:259354679
> BUG=b:247100970 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
> Signed-off-by: YH Lin <yueherngl@google.com>

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

1 files changed, 0 insertions, 371 deletions

diff --git a/zephyr/program/nissa/pujjo/overlay.dtsi b/zephyr/program/nissa/pujjo/overlay.dtsi
deleted file mode 100644
index cb20ec6554..0000000000
--- a/zephyr/program/nissa/pujjo/overlay.dtsi
+++ /dev/null
@@ -1,371 +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.
- */
-
-#include <cros/thermistor/thermistor.dtsi>
-#include <dt-bindings/usb_pd_tcpm.h>
-
-/ {
-	aliases {
-		gpio-cbi-wp = &gpio_ec_cbi_wp;
-		gpio-wp = &gpio_ec_wp_odl;
-		int-wp = &int_wp_l;
-		gpio-kbd-kso2 = &gpio_ec_kso_02_inv;
-	};
-
-	ec-console {
-		compatible = "ec-console";
-		disabled = "events", "lpc", "hostcmd";
-	};
-
-	batteries {
-		default_battery: smp {
-			compatible = "smp,l22m3pg0", "battery-smart";
-		};
-		smp_l22m3pg1 {
-			compatible = "smp,l22m3pg1", "battery-smart";
-		};
-		sunwoda_l22d3pg0 {
-			compatible = "sunwoda,l22d3pg0", "battery-smart";
-		};
-		sunwoda_l22d3pg1 {
-			compatible = "sunwoda,l22d3pg1", "battery-smart";
-		};
-		celxpert_l22c3pg0 {
-			compatible = "celxpert,l22c3pg0", "battery-smart";
-		};
-	};
-
-	hibernate-wake-pins {
-		compatible = "cros-ec,hibernate-wake-pins";
-		wakeup-irqs = <
-			&int_power_button
-			&int_lid_open
-		>;
-	};
-
-	gpio-interrupts {
-		compatible = "cros-ec,gpio-interrupts";
-
-		int_power_button: power_button {
-			irq-pin = <&gpio_gsc_ec_pwr_btn_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "power_button_interrupt";
-		};
-		int_wp_l: wp_l {
-			irq-pin = <&gpio_ec_wp_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "switch_interrupt";
-		};
-		int_lid_open: lid_open {
-			irq-pin = <&gpio_lid_open>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "lid_interrupt";
-		};
-		int_tablet_mode: tablet_mode {
-			irq-pin = <&gpio_tablet_mode_l>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "gmr_tablet_switch_isr";
-		};
-		int_imu: ec_imu {
-			irq-pin = <&gpio_imu_int_l>;
-			flags = <GPIO_INT_EDGE_FALLING>;
-			handler = "motion_interrupt";
-		};
-		int_lid_accel: lid_accel {
-			irq-pin = <&gpio_acc_int_l>;
-			flags = <GPIO_INT_EDGE_FALLING>;
-			handler = "lid_accel_interrupt";
-		};
-		int_vol_down: vol_down {
-			irq-pin = <&gpio_voldn_btn_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "button_interrupt";
-		};
-		int_vol_up: vol_up {
-			irq-pin = <&gpio_volup_btn_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "button_interrupt";
-		};
-		int_usb_c0: usb_c0 {
-			irq-pin = <&gpio_usb_c0_int_odl>;
-			flags = <GPIO_INT_EDGE_FALLING>;
-			handler = "usb_interrupt";
-		};
-	};
-
-	named-gpios {
-		gpio_sb_2: sb_2 {
-			gpios = <&gpiod 4 GPIO_OUTPUT>;
-			no-auto-init;
-		};
-
-		gpio_sb_3: sb_3 {
-			gpios = <&gpiof 5 (GPIO_OPEN_DRAIN | GPIO_VOLTAGE_1P8)>;
-			no-auto-init;
-		};
-		gpio_sb_4: sb_4 {
-			gpios = <&gpiof 4 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			no-auto-init;
-		};
-		gpio_fan_enable: fan-enable {
-			gpios = <&gpio6 3 GPIO_OUTPUT>;
-			no-auto-init;
-		};
-		ec-i2c-sensor-scl {
-			gpios = <&gpio9 0 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-		};
-		ec-i2c-sensor-sda {
-			gpios = <&gpio8 7 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-		};
-		gpio_power_led: power_led {
-			gpios = <&gpioc 2 GPIO_OUTPUT_LOW>;
-		};
-		gpio_led_1_odl: led_1_odl {
-			gpios = <&gpioc 4 GPIO_OUTPUT_LOW>;
-		};
-		gpio_led_2_odl: led_2_odl {
-			gpios = <&gpioc 3 GPIO_OUTPUT_LOW>;
-		};
-	};
-
-	/*
-	 * Aliases used for sub-board GPIOs.
-	 */
-	aliases {
-		/*
-		 * Sub-board with type A USB, enable.
-		 */
-		gpio-en-usb-a1-vbus = &gpio_sb_2;
-		/*
-		 * HPD pins for HDMI sub-board.
-		 */
-		gpio-hdmi-en-odl = &gpio_sb_3;
-		gpio-hpd-odl = &gpio_sb_4;
-		/*
-		 * Enable S5 rails for LTE sub-board
-		 */
-		gpio-en-sub-s5-rails = &gpio_sb_2;
-	};
-
-	temp_cpu: cpu {
-		compatible = "cros-ec,temp-sensor-thermistor";
-		thermistor = <&thermistor_3V3_51K1_47K_4050B>;
-		adc = <&adc_temp_sensor_1>;
-	};
-	temp_ddr: ddr {
-		compatible = "cros-ec,temp-sensor-thermistor";
-		thermistor = <&thermistor_3V3_51K1_47K_4050B>;
-		adc = <&adc_temp_sensor_2>;
-	};
-	temp_ambient: ambient {
-		compatible = "cros-ec,temp-sensor-thermistor";
-		thermistor = <&thermistor_3V3_51K1_47K_4050B>;
-		adc = <&adc_temp_sensor_3>;
-	};
-
-	named-temp-sensors {
-		compatible = "cros-ec,temp-sensors";
-		cpu {
-			temp_fan_off = <35>;
-			temp_fan_max = <60>;
-			temp_host_high = <90>;
-			temp_host_halt = <100>;
-			temp_host_release_high = <85>;
-			power-good-pin = <&gpio_ec_soc_dsw_pwrok>;
-			sensor = <&temp_cpu>;
-		};
-		ddr {
-			temp_fan_off = <35>;
-			temp_fan_max = <60>;
-			temp_host_high = <90>;
-			temp_host_halt = <100>;
-			temp_host_release_high = <85>;
-			power-good-pin = <&gpio_ec_soc_dsw_pwrok>;
-			sensor = <&temp_ddr>;
-		};
-		ambient {
-			temp_fan_off = <35>;
-			temp_fan_max = <60>;
-			temp_host_high = <90>;
-			temp_host_halt = <100>;
-			temp_host_release_high = <85>;
-			power-good-pin = <&gpio_ec_soc_dsw_pwrok>;
-			sensor = <&temp_ambient>;
-		};
-	};
-
-	usba {
-		compatible = "cros-ec,usba-port-enable-pins";
-		/*
-		 * sb_2 is only configured as GPIO when USB-A1 is present,
-		 * but it's still safe to control when disabled.
-		 *
-		 * ILIM_SEL pins are referred to by legacy enum name,
-		 * GPIO_USB*_ILIM_SEL. The one for port A1 is unused on
-		 * sub-boards that don't have USB-A so is safe to control
-		 * regardless of system configuration.
-		 */
-		enable-pins = <&gpio_en_usb_a0_vbus &gpio_sb_2>;
-		status = "okay";
-	};
-
-	usbc {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		port0@0 {
-			compatible = "named-usbc-port";
-			reg = <0>;
-			bc12 = <&bc12_port0>;
-			chg = <&chg_port0>;
-			tcpc = <&tcpc_port0>;
-			usb-mux-chain-0 {
-				compatible = "cros-ec,usb-mux-chain";
-				usb-muxes = <&virtual_mux_0>;
-			};
-		};
-		port0-muxes {
-			virtual_mux_0: virtual-mux-0 {
-				compatible = "cros-ec,usbc-mux-virtual";
-			};
-		};
-	};
-
-	fans {
-		compatible = "cros-ec,fans";
-
-		fan_0 {
-			pwms = <&pwm5 5 PWM_KHZ(1) PWM_POLARITY_NORMAL>;
-			rpm_min = <2200>;
-			rpm_start = <2200>;
-			rpm_max = <4200>;
-			tach = <&tach2>;
-			enable_gpio = <&gpio_fan_enable>;
-		};
-	};
-
-	 /*
-	  * Declare unused GPIOs so that they are shut down
-	  * and use minimal power
-	  */
-	  unused-pins {
-		compatible = "unused-gpios";
-		unused-gpios =
-			<&gpio3 3 0>,
-			<&gpio3 6 0>,
-			<&gpiod 7 0>,
-			<&gpiof 2 0>,
-			<&gpiof 3 0>;
-	 };
-};
-
-&thermistor_3V3_51K1_47K_4050B {
-	status = "okay";
-};
-
-&adc_ec_vsense_pp3300_s5 {
-	/*
-	 * Voltage divider on input has 47k upper and 220k lower legs with
-	 * 2714 mV full-scale reading on the ADC. Apply the largest possible
-	 * multiplier (without overflowing int32) to get the best possible
-	 * approximation of the actual ratio, but derate by a factor of two to
-	 * ensure unexpectedly high values won't overflow.
-	 */
-	mul = <(791261 / 2)>;
-	div = <(651975 / 2)>;
-};
-
-/* Set bus speeds for I2C */
-&i2c0_0 {
-	label = "I2C_EEPROM";
-	clock-frequency = <I2C_BITRATE_FAST>;
-
-	cbi_eeprom: eeprom@50 {
-		compatible = "atmel,at24";
-		reg = <0x50>;
-		size = <2048>;
-		pagesize = <16>;
-		address-width = <8>;
-		timeout = <5>;
-	};
-};
-
-&i2c1_0 {
-	label = "I2C_SENSOR";
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c3_0 {
-	label = "I2C_USB_C0_TCPC";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-
-	bc12_port0: pi3usb9201@5f {
-		compatible = "pericom,pi3usb9201";
-		status = "okay";
-		reg = <0x5f>;
-		/*
-		 * BC1.2 interrupt is shared with TCPC, so
-		 * IRQ is not specified here and handled by
-		 * usb_c0_interrupt.
-		 */
-	};
-
-	chg_port0: isl923x@9 {
-		compatible = "intersil,isl923x";
-		status = "okay";
-		reg = <0x9>;
-	};
-
-	tcpc_port0: raa489000@22 {
-		compatible = "renesas,raa489000";
-		reg = <0x22>;
-		tcpc-flags = <(
-			TCPC_FLAGS_TCPCI_REV2_0 |
-			TCPC_FLAGS_VBUS_MONITOR)>;
-	};
-};
-
-&i2c7_0 {
-	label = "I2C_BATTERY";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-};
-
-&pwm5_gpb7 {
-	drive-open-drain;
-};
-
-&pwm5 {
-	status = "okay";
-	clock-bus = "NPCX_CLOCK_BUS_LFCLK";
-	pinctrl-0 = <&pwm5_gpb7>;
-	pinctrl-names = "default";
-};
-
-/* Tachometer for fan speed measurement */
-&tach2 {
-	status = "okay";
-	pinctrl-0 = <&ta2_1_in_gp73>;
-	pinctrl-names = "default";
-	port = <NPCX_TACH_PORT_A>; /* port-A is selected */
-	sample-clk = <NPCX_TACH_FREQ_LFCLK>; /* Use LFCLK as sampling clock */
-	pulses-per-round = <2>; /* number of pulses per round of encoder */
-};
-
-/* host interface */
-&espi0 {
-	status = "okay";
-	pinctrl-0 = <&espi_lpc_gp46_47_51_52_53_54_55_57>;
-	pinctrl-names = "default";
-};
-
-/*
- * Declare GPIOs that have leakage current caused by board issues here. NPCX ec
- * will disable their input buffers before entering deep sleep and restore them
- * after waking up automatically for better power consumption.
- */
-&power_leakage_io {
-	leak-gpios = <&gpioa 4 0
-		      &gpiof 1 0>;
-};