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>

15 files changed, 22 insertions, 54 deletions

diff --git a/zephyr/shim/include/usbc/bc12_rt9490.h b/zephyr/shim/include/usbc/bc12_rt9490.h
index c4323728f9..a9371ddeea 100644
--- a/zephyr/shim/include/usbc/bc12_rt9490.h
+++ b/zephyr/shim/include/usbc/bc12_rt9490.h
@@ -5,7 +5,7 @@
 
 #include "driver/charger/rt9490.h"
 
-#define RT9490_BC12_COMPAT richtek_rt9490
+#define RT9490_BC12_COMPAT richtek_rt9490_bc12
 
 #define BC12_CHIP_RT9490(id)             \
 	{                                \
diff --git a/zephyr/shim/include/usbc/ppc.h b/zephyr/shim/include/usbc/ppc.h
index fa38145f66..28e518a3ef 100644
--- a/zephyr/shim/include/usbc/ppc.h
+++ b/zephyr/shim/include/usbc/ppc.h
@@ -6,16 +6,15 @@
 #ifndef ZEPHYR_CHROME_USBC_PPC_H
 #define ZEPHYR_CHROME_USBC_PPC_H
 
-#include "usbc/ppc_nx20p348x.h"
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include "usbc/ppc_rt1739.h"
+#include "usbc/ppc_nx20p348x.h"
 #include "usbc/ppc_sn5s330.h"
 #include "usbc/ppc_syv682x.h"
 #include "usbc/utils.h"
 #include "usbc_ppc.h"
 
-#include <zephyr/device.h>
-#include <zephyr/devicetree.h>
-
 extern struct ppc_config_t ppc_chips_alt[];
 
 #define ALT_PPC_CHIP_CHK(usbc_id, usb_port_num)                              \
diff --git a/zephyr/shim/include/usbc/tcpc_anx7447.h b/zephyr/shim/include/usbc/tcpc_anx7447.h
index 89076c8c49..b45e03393c 100644
--- a/zephyr/shim/include/usbc/tcpc_anx7447.h
+++ b/zephyr/shim/include/usbc/tcpc_anx7447.h
@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "tcpm/anx7447_public.h"
-
 #include <zephyr/devicetree.h>
+#include "tcpm/anx7447_public.h"
 
 #define ANX7447_TCPC_COMPAT analogix_anx7447_tcpc
 
diff --git a/zephyr/shim/include/usbc/tcpc_anx7447_emul.h b/zephyr/shim/include/usbc/tcpc_anx7447_emul.h
index 3367286dd9..78322a7329 100644
--- a/zephyr/shim/include/usbc/tcpc_anx7447_emul.h
+++ b/zephyr/shim/include/usbc/tcpc_anx7447_emul.h
@@ -3,11 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include "driver/tcpm/anx7447_public.h"
-
 #include <zephyr/devicetree.h>
+#include "driver/tcpm/anx7447_public.h"
 
-#define ANX7447_EMUL_COMPAT cros_anx7447_tcpc_emul
+#define ANX7447_EMUL_COMPAT cros_anx7447_emul
 
 #define TCPC_CONFIG_ANX7447_EMUL(id) \
 	{                                              \
diff --git a/zephyr/shim/include/usbc/tcpc_ccgxxf.h b/zephyr/shim/include/usbc/tcpc_ccgxxf.h
index fb7bdcabcf..0c02cf6846 100644
--- a/zephyr/shim/include/usbc/tcpc_ccgxxf.h
+++ b/zephyr/shim/include/usbc/tcpc_ccgxxf.h
@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "driver/tcpm/ccgxxf.h"
-
 #include <zephyr/devicetree.h>
+#include "driver/tcpm/ccgxxf.h"
 
 #define CCGXXF_TCPC_COMPAT cypress_ccgxxf
 
diff --git a/zephyr/shim/include/usbc/tcpc_fusb302.h b/zephyr/shim/include/usbc/tcpc_fusb302.h
index fa309051cd..a2e512d938 100644
--- a/zephyr/shim/include/usbc/tcpc_fusb302.h
+++ b/zephyr/shim/include/usbc/tcpc_fusb302.h
@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "driver/tcpm/fusb302.h"
-
 #include <zephyr/devicetree.h>
+#include "driver/tcpm/fusb302.h"
 
 #define FUSB302_TCPC_COMPAT fairchild_fusb302
 
diff --git a/zephyr/shim/include/usbc/tcpc_generic_emul.h b/zephyr/shim/include/usbc/tcpc_generic_emul.h
index 9000dfdf20..7dc46c51ba 100644
--- a/zephyr/shim/include/usbc/tcpc_generic_emul.h
+++ b/zephyr/shim/include/usbc/tcpc_generic_emul.h
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include "driver/tcpm/tcpci.h"
-
 #include <zephyr/devicetree.h>
 
+#include "driver/tcpm/tcpci.h"
+
 #define TCPCI_EMUL_COMPAT cros_tcpci_generic_emul
 
 #define TCPC_CONFIG_TCPCI_EMUL(id) \
diff --git a/zephyr/shim/include/usbc/tcpc_it8xxx2.h b/zephyr/shim/include/usbc/tcpc_it8xxx2.h
index b9084782e0..c619656667 100644
--- a/zephyr/shim/include/usbc/tcpc_it8xxx2.h
+++ b/zephyr/shim/include/usbc/tcpc_it8xxx2.h
@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "driver/tcpm/it8xxx2_pd_public.h"
-
 #include <zephyr/devicetree.h>
+#include "driver/tcpm/it8xxx2_pd_public.h"
 
 #define IT8XXX2_TCPC_COMPAT ite_it8xxx2_usbpd
 
diff --git a/zephyr/shim/include/usbc/tcpc_nct38xx.h b/zephyr/shim/include/usbc/tcpc_nct38xx.h
index 7a0752904e..87ba3379c8 100644
--- a/zephyr/shim/include/usbc/tcpc_nct38xx.h
+++ b/zephyr/shim/include/usbc/tcpc_nct38xx.h
@@ -6,9 +6,8 @@
 #ifndef __CROS_EC_TCPC_NCT38XX_H
 #define __CROS_EC_TCPC_NCT38XX_H
 
-#include "driver/tcpm/nct38xx.h"
-
 #include <zephyr/devicetree.h>
+#include "driver/tcpm/nct38xx.h"
 
 #define NCT38XX_TCPC_COMPAT nuvoton_nct38xx
 
diff --git a/zephyr/shim/include/usbc/tcpc_ps8xxx.h b/zephyr/shim/include/usbc/tcpc_ps8xxx.h
index 7d3b9c6ccc..1a457af09b 100644
--- a/zephyr/shim/include/usbc/tcpc_ps8xxx.h
+++ b/zephyr/shim/include/usbc/tcpc_ps8xxx.h
@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "driver/tcpm/ps8xxx_public.h"
-
 #include <zephyr/devicetree.h>
+#include "driver/tcpm/ps8xxx_public.h"
 
 #define PS8XXX_COMPAT parade_ps8xxx
 
diff --git a/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h b/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h
index b1ea6f1705..fbd2e4bfd1 100644
--- a/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h
+++ b/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h
@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "driver/tcpm/ps8xxx_public.h"
-
 #include <zephyr/devicetree.h>
+#include "driver/tcpm/ps8xxx_public.h"
 
 #define PS8XXX_EMUL_COMPAT cros_ps8xxx_emul
 
diff --git a/zephyr/shim/include/usbc/tcpc_raa489000.h b/zephyr/shim/include/usbc/tcpc_raa489000.h
deleted file mode 100644
index 47e7706ae1..0000000000
--- a/zephyr/shim/include/usbc/tcpc_raa489000.h
+++ /dev/null
@@ -1,21 +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 "driver/tcpm/raa489000.h"
-
-#include <zephyr/devicetree.h>
-
-#define RAA489000_TCPC_COMPAT renesas_raa489000
-
-#define TCPC_CONFIG_RAA489000(id) \
-	{                                              \
-		.bus_type = EC_BUS_TYPE_I2C,           \
-		.i2c_info = {                          \
-			.port = I2C_PORT_BY_DEV(id),   \
-			.addr_flags = DT_REG_ADDR(id), \
-		},                                     \
-		.drv = &raa489000_tcpm_drv,              \
-		.flags = DT_PROP(id, tcpc_flags),      \
-	},
diff --git a/zephyr/shim/include/usbc/tcpc_rt1718s.h b/zephyr/shim/include/usbc/tcpc_rt1718s.h
index 861b474ecf..794fb99480 100644
--- a/zephyr/shim/include/usbc/tcpc_rt1718s.h
+++ b/zephyr/shim/include/usbc/tcpc_rt1718s.h
@@ -3,9 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "tcpm/rt1718s_public.h"
-
 #include <zephyr/devicetree.h>
+#include "tcpm/rt1718s_public.h"
 
 #define RT1718S_TCPC_COMPAT richtek_rt1718s_tcpc
 
diff --git a/zephyr/shim/include/usbc/tcpci.h b/zephyr/shim/include/usbc/tcpci.h
index 15cea4b332..67138dbe99 100644
--- a/zephyr/shim/include/usbc/tcpci.h
+++ b/zephyr/shim/include/usbc/tcpci.h
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include "driver/tcpm/tcpci.h"
-
 #include <zephyr/devicetree.h>
 
+#include "driver/tcpm/tcpci.h"
+
 #define TCPCI_COMPAT cros_ec_tcpci
 
 #define TCPC_CONFIG_TCPCI(id) \
diff --git a/zephyr/shim/include/usbc/usb_muxes.h b/zephyr/shim/include/usbc/usb_muxes.h
index 6ee9c691a8..f94aed488d 100644
--- a/zephyr/shim/include/usbc/usb_muxes.h
+++ b/zephyr/shim/include/usbc/usb_muxes.h
@@ -6,6 +6,8 @@
 #ifndef ZEPHYR_CHROME_USBC_USB_MUXES_H
 #define ZEPHYR_CHROME_USBC_USB_MUXES_H
 
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util_macro.h>
 #include "usb_mux.h"
 #include "usbc/amd_fp6_usb_mux.h"
 #include "usbc/anx7447_usb_mux.h"
@@ -19,9 +21,6 @@
 #include "usbc/utils.h"
 #include "usbc/virtual_usb_mux.h"
 
-#include <zephyr/devicetree.h>
-#include <zephyr/sys/util_macro.h>
-
 /**
  * @brief List of USB mux drivers compatibles and their configurations. Each
  *        element of list has to have (compatible, config) format.
@@ -178,14 +177,14 @@
  * @brief Set struct usb_mux fields common for all USB muxes and alter flags
  *
  * @param mux_id USB mux node ID
- * @param flags_mask Mask for bits that should be ignored in flags property
+ * @param flags_mask Mask for bits that should be igonred in flags property
  * @param flags_val Value that should be used instead for masked bits
  */
 #define USB_MUX_COMMON_FIELDS_WITH_FLAGS(mux_id, flags_mask, flags_val) \
 	.usb_port = USB_MUX_PORT(mux_id),                               \
 	.board_init = USB_MUX_CALLBACK_OR_NULL(mux_id, board_init),     \
 	.board_set = USB_MUX_CALLBACK_OR_NULL(mux_id, board_set),       \
-	.flags = (DT_PROP_OR(mux_id, flags, 0) & ~(flags_mask)) | (flags_val)
+	.flags = (DT_PROP(mux_id, flags) & ~(flags_mask)) | (flags_val)
 
 /**
  * @brief Set struct usb_mux fields common for all USB muxes