Merge remote-tracking branch cros/main into firmware-keeby-14119.B-mainfirmware-keeby-14119.B-main

Relevant changes:

git log --oneline c5bd23a4b..b44d10f8f -- baseboard/dedede board/cappy2
board/corori board/driblee board/gooey board/haboki board/lalala
board/waddledoo2 common/charge_state_v2.c common/mkbp_* common/ocpc.c
common/usbc/usb_tc_drp_acc_trysrc_sm.c common/usbc/usb_sm.c
common/usbc/*_pd_* common/usbc/dp_alt_mode.c common/usbc/usb_prl_sm.c
common/usbc/usb_pe_drp_sm.c common/usb_charger.c common/usb_common.c
common/usbc_ocp.c driver/charger/sm5803.* driver/charger/isl923x.*
driver/tcpm/raa489000.* driver/tcpm/it83* include/power/icelake.h
include/intel_x86.h power/icelake.c power/intel_x86.c util/getversion.sh

42d03a001 config: change temp_sensor_power from config to gpio
e296efb28 usb_common: Fix CONFIG_USB_PD_DISCHARGE_TCPC typo
c346481f4 atomic: cast to unsigned when shifting
9b972a0f2 driver/tcpm/it83xx, it8xxx2: ITE inactive port return from HOOK
a499d8fd4 driver/tcpm/it83xx, it8xxx2: set sleep mask for mixed TCPC case
ed62e2583 TCPMv2: don't set the sleep mask for TCPC embedded in EC
c962696e8 motion_sensor: Remove |int_signal| field
86b216794 ocpc: modify pre-charge target condition
6f8336eb4 dedede: Set MKBP event wake mask to 0
02d034df0 dedede: add stylus fw_config
4f7cd7509 atomic: use atomic_t where it is possible
e3ffa0519 mkbp: change the type fifo_entries to atomic_t
bb4c47af0 usb: use atomic_t where possible
c6e513ee2 power/icelake: Add SLP_S5 as a watched power signal
d89e49b20 power: Introduce S4 as a real power state
ba8a3c9c0 chgstv2: Use chipset_in_state instead of naming states
23a975d12 i2c: Use declared initializers for i2c_ports: boards a-l
35865dbec TCPMv2: Guard DATA_RESET using CONFIG_USB_PD_DATA_RESET_MSG
d4d8243ed i2c: Use declared initializers for i2c_ports: baseboards
eba8d0305 RAA489000: Fixed RAA489000 max charging current
e78b83e0f TCPMv2: Delay Data Reset until mode entry request
6230e60fc TCPMv2: Support Data Reset as DFP, initiator
412246836 intel_x86: Apply chipset resume init and suspend complete hooks
f2809b72c config: rename CONFIG_HOSTCMD_ESPI to CONFIG_HOST_INTERFACE_ESPI

BRANCH=None
BUG=b:202796060 b:207805856 b:167983049 b:208318528 b:181983966
BUG=b:207328258 b:195416058 b:205285137 b:199919093 b:207055975
BUG=b:129159505 b:204947672 b:141363146 b:207082842 b:205675485
TEST=`make -j buildall`

Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: I980351977e11088a130e478df0701be4715f049b

1 files changed, 8 insertions, 17 deletions

diff --git a/zephyr/boards/arm/volteer/volteer.dts b/zephyr/boards/arm/volteer/volteer.dts
index f25363f03f..79d08170af 100644
--- a/zephyr/boards/arm/volteer/volteer.dts
+++ b/zephyr/boards/arm/volteer/volteer.dts
@@ -53,48 +53,39 @@
 		i2c_sensor: sensor {
 			i2c-port = <&i2c0_0>;
 			enum-name = "I2C_PORT_SENSOR";
-			label = "SENSOR";
 		};
 		i2c-accel {
 			i2c-port = <&i2c0_0>;
 			enum-name = "I2C_PORT_ACCEL";
-			label = "ACCEL";
 		};
 		i2c_usb_c0: usb-c0 {
 			i2c-port = <&i2c1_0>;
 			enum-name = "I2C_PORT_USB_C0";
-			label = "USB_C0";
 		};
 		i2c_usb_c1: usb-c1 {
 			i2c-port = <&i2c2_0>;
 			enum-name = "I2C_PORT_USB_C1";
-			label = "USB_C1";
 		};
 		usb1-mix {
 			i2c-port = <&i2c3_0>;
 			enum-name = "I2C_PORT_USB_1_MIX";
-			label = "USB_1_MIX";
 		};
 		power {
 			i2c-port = <&i2c5_0>;
 			enum-name = "I2C_PORT_POWER";
-			label = "POWER";
 		};
 		battery {
 			i2c-port = <&i2c5_0>;
 			enum-name = "I2C_PORT_BATTERY";
-			label = "BATTERY";
 		};
 		eeprom {
 			i2c-port = <&i2c7_0>;
 			remote-port = <7>;
 			enum-name = "I2C_PORT_EEPROM";
-			label = "EEPROM";
 		};
 		charger {
 			i2c-port = <&i2c7_0>;
 			enum-name = "I2C_PORT_CHARGER";
-			label = "CHARGER";
 		};
 	};
 
@@ -102,22 +93,22 @@
 		compatible = "named-adc-channels";
 
 		adc_charger: charger {
-			label = "ADC_TEMP_SENSOR_CHARGER";
+			label = "TEMP_CHARGER";
 			enum-name = "ADC_TEMP_SENSOR_CHARGER";
 			channel = <0>;
 		};
 		adc_pp3300_regulator: pp3300_regulator {
-			label = "ADC_TEMP_SENSOR_PP3300_REGULATOR";
+			label = "TEMP_PP3300_REGULATOR";
 			enum-name = "ADC_TEMP_SENSOR_PP3300_REGULATOR";
 			channel = <1>;
 		};
 		adc_ddr_soc: ddr_soc {
-			label = "ADC_TEMP_SENSOR_DDR_SOC";
+			label = "TEMP_DDR_SOC";
 			enum-name = "ADC_TEMP_SENSOR_DDR_SOC";
 			channel = <8>;
 		};
 		adc_fan: fan {
-			label = "ADC_TEMP_SENSOR_FAN";
+			label = "TEMP_FAN";
 			enum-name = "ADC_TEMP_SENSOR_FAN";
 			channel = <3>;
 		};
@@ -125,7 +116,7 @@
 
 	named-temp-sensors {
 		charger {
-			compatible = "cros-ec,temp-sensor";
+			compatible = "cros-ec,temp-sensor-thermistor";
 			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
 			label = "TEMP_SENSOR_CHARGER";
 			enum-name = "TEMP_SENSOR_CHARGER";
@@ -137,7 +128,7 @@
 			adc = <&adc_charger>;
 		};
 		pp3300_regulator {
-			compatible = "cros-ec,temp-sensor";
+			compatible = "cros-ec,temp-sensor-thermistor";
 			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
 			label = "TEMP_SENSOR_PP3300_REGULATOR";
 			enum-name = "TEMP_SENSOR_PP3300_REGULATOR";
@@ -149,7 +140,7 @@
 			adc = <&adc_pp3300_regulator>;
 		};
 		ddr_soc {
-			compatible = "cros-ec,temp-sensor";
+			compatible = "cros-ec,temp-sensor-thermistor";
 			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
 			label = "TEMP_SENSOR_DDR_SOC";
 			enum-name = "TEMP_SENSOR_DDR_SOC";
@@ -161,7 +152,7 @@
 			adc = <&adc_ddr_soc>;
 		};
 		fan {
-			compatible = "cros-ec,temp-sensor";
+			compatible = "cros-ec,temp-sensor-thermistor";
 			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
 			label = "TEMP_SENSOR_FAN";
 			enum-name = "TEMP_SENSOR_FAN";