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, 12 insertions, 8 deletions

diff --git a/zephyr/shim/src/led_driver/led.c b/zephyr/shim/src/led_driver/led.c
index 011632ac83..9a1c07b310 100644
--- a/zephyr/shim/src/led_driver/led.c
+++ b/zephyr/shim/src/led_driver/led.c
@@ -5,7 +5,7 @@
  * Power and battery LED control.
  */
 
-#include <zephyr/drivers/gpio.h>
+#define DT_DRV_COMPAT cros_ec_led_policy
 
 #include "battery.h"
 #include "charge_manager.h"
@@ -21,10 +21,12 @@
 #include "util.h"
 
 #include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(led, LOG_LEVEL_ERR);
 
-#define LED_COLOR_NODE DT_PATH(led_colors)
+BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
+	     "Exactly one instance of cros-ec,led-policy should be defined.");
 
 struct led_color_node_t {
 	struct led_pins_node_t *pins_node;
@@ -33,10 +35,12 @@ struct led_color_node_t {
 
 #define DECLARE_PINS_NODE(id) extern struct led_pins_node_t PINS_NODE(id);
 
-#if DT_HAS_COMPAT_STATUS_OKAY(COMPAT_PWM_LED)
-DT_FOREACH_CHILD(PWM_LED_PINS_NODE, DECLARE_PINS_NODE)
-#elif DT_HAS_COMPAT_STATUS_OKAY(COMPAT_GPIO_LED)
-DT_FOREACH_CHILD(GPIO_LED_PINS_NODE, DECLARE_PINS_NODE)
+#if CONFIG_PLATFORM_EC_LED_DT_PWM
+DT_FOREACH_CHILD(DT_COMPAT_GET_ANY_STATUS_OKAY(cros_ec_pwm_led_pins),
+		 DECLARE_PINS_NODE)
+#elif CONFIG_PLATFORM_EC_LED_DT_GPIO
+DT_FOREACH_CHILD(DT_COMPAT_GET_ANY_STATUS_OKAY(cros_ec_gpio_led_pins),
+		 DECLARE_PINS_NODE)
 #endif
 
 /*
@@ -113,8 +117,8 @@ struct node_prop_t {
 		  LED_COLOR_INIT(3, 4, state_id),                             \
 	  } },
 
-static const struct node_prop_t node_array[] = { DT_FOREACH_CHILD(
-	LED_COLOR_NODE, SET_LED_VALUES) };
+static const struct node_prop_t node_array[] = { DT_INST_FOREACH_CHILD(
+	0, SET_LED_VALUES) };
 
 test_export_static enum power_state get_chipset_state(void)
 {