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>

1 files changed, 3 insertions, 31 deletions

diff --git a/zephyr/shim/include/power/power.h b/zephyr/shim/include/power/power.h
index 1e780646af..a764e0c8b5 100644
--- a/zephyr/shim/include/power/power.h
+++ b/zephyr/shim/include/power/power.h
@@ -9,29 +9,9 @@
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/gpio.h>
 
-#define POWER_SIGNAL_LIST_NODE DT_NODELABEL(power_signal_list)
-
-#define SYSTEM_DT_POWER_SIGNAL_CONFIG DT_NODE_EXISTS(POWER_SIGNAL_LIST_NODE)
-
-#if (SYSTEM_DT_POWER_SIGNAL_CONFIG)
-
-#define GEN_POWER_SIGNAL_STRUCT_ENTRY_GPIO(cid) \
-	DT_STRING_UPPER_TOKEN(DT_PROP(cid, power_gpio_pin), enum_name)
-#define GEN_POWER_SIGNAL_STRUCT_ENTRY_FLAGS(cid)              \
-	(DT_GPIO_FLAGS(DT_PROP(cid, power_gpio_pin), gpios) & \
-			 GPIO_ACTIVE_LOW ?                    \
-		 POWER_SIGNAL_ACTIVE_LOW :                    \
-		 POWER_SIGNAL_ACTIVE_HIGH)
-#define GEN_POWER_SIGNAL_STRUCT_ENTRY_NAME(cid) DT_PROP(cid, power_enum_name)
+#if CONFIG_CROS_EC_POWER_SIGNAL_LIST
 
-#define GEN_POWER_SIGNAL_STRUCT_ENTRY(cid)                         \
-	{                                                          \
-		.gpio = GEN_POWER_SIGNAL_STRUCT_ENTRY_GPIO(cid),   \
-		.flags = GEN_POWER_SIGNAL_STRUCT_ENTRY_FLAGS(cid), \
-		.name = GEN_POWER_SIGNAL_STRUCT_ENTRY_NAME(cid)    \
-	}
-#define GEN_POWER_SIGNAL_STRUCT(cid) \
-	[GEN_POWER_SIGNAL_ENUM_ENTRY(cid)] = GEN_POWER_SIGNAL_STRUCT_ENTRY(cid),
+#define POWER_SIGNAL_LIST_NODE DT_NODELABEL(power_signal_list)
 
 #define GEN_POWER_SIGNAL_ENUM_ENTRY(cid) \
 	DT_STRING_UPPER_TOKEN(cid, power_enum_name)
@@ -42,13 +22,5 @@ enum power_signal {
 	POWER_SIGNAL_COUNT
 };
 
-/*
- * Verify the number of required power-signals are specified in
- * the DeviceTree
- */
-#define POWER_SIGNALS_REQUIRED \
-	DT_PROP(POWER_SIGNAL_LIST_NODE, power_signals_required)
-BUILD_ASSERT(POWER_SIGNALS_REQUIRED == POWER_SIGNAL_COUNT);
-
-#endif /* SYSTEM_DT_POWER_SIGNAL_CONFIG */
+#endif /* CONFIG_CROS_EC_POWER_SIGNAL_LIST */
 #endif /* ZEPHYR_CHROME_POWER_POWER_H */