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, 125 insertions, 0 deletions

diff --git a/driver/ppc/ktu1125.h b/driver/ppc/ktu1125.h
new file mode 100644
index 0000000000..826c6a925e
--- /dev/null
+++ b/driver/ppc/ktu1125.h
@@ -0,0 +1,125 @@
+/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Kinetic KTU1125 Type-C Power Path Controller */
+
+#ifndef __CROS_EC_KTU1125_H
+#define __CROS_EC_KTU1125_H
+
+#include "common.h"
+
+#include "driver/ppc/ktu1125_public.h"
+
+#define KTU1125_ID		0x0
+#define KTU1125_CTRL_SW_CFG	0x1
+#define KTU1125_SET_SW_CFG	0x2
+#define KTU1125_SET_SW2_CFG	0x3
+#define KTU1125_MONITOR_SNK	0x4
+#define KTU1125_MONITOR_SRC	0x5
+#define KTU1125_MONITOR_DATA	0x6
+#define KTU1125_INTMASK_SNK	0x7
+#define KTU1125_INTMASK_SRC	0x8
+#define KTU1125_INTMASK_DATA	0x9
+#define KTU1125_INT_SNK		0xA
+#define KTU1125_INT_SRC		0xB
+#define KTU1125_INT_DATA	0xC
+
+/* KTU1125_ID default value */
+#define KTU1125_VENDOR_DIE_IDS 0xA5
+
+/* KTU1125_CTRL_SW_CFG bits */
+#define KTU1125_SBU_SHUT	BIT(0)
+#define KTU1125_VCONN_EN	BIT(1)
+#define KTU1125_CC2S_VCONN	BIT(2)
+#define KTU1125_CC1S_VCONN	BIT(3)
+#define KTU1125_POW_MODE	BIT(4)
+#define KTU1125_SW_AB_EN	BIT(5)
+#define KTU1125_FRS_EN		BIT(6)
+#define KTU1125_EN_L		BIT(7)
+
+/* KTU1125_SET_SW_CFG bits and fields */
+#define KTU1125_RDB_DIS		BIT(0)
+#define KTU1125_SS_CLP_SNK	BIT(1)
+#define KTU1125_TDON		BIT(2)
+#define KTU1125_VCONN_CLP_SHIFT	3
+#define KTU1125_VCONN_CLP_LEN	2
+#define KTU1125_SYSB_CLP_SHIFT	5
+#define KTU1125_SYSB_CLP_LEN	3
+
+/* VBUS Switch Current Limit Settings - SYSB_CLP */
+#define KTU1125_SYSB_ILIM_0_6	0
+#define KTU1125_SYSB_ILIM_1_05	1
+#define KTU1125_SYSB_ILIM_1_70	2
+#define KTU1125_SYSB_ILIM_3_30	3
+#define KTU1125_SYSB_ILIM_3_60	4
+
+/* VCONN Current Limit Settings - VCONN_CLP */
+#define KTU1125_VCONN_ILIM_0_40	0
+#define KTU1125_VCONN_ILIM_0_60	1
+#define KTU1125_VCONN_ILIM_1_00	2
+#define KTU1125_VCONN_ILIM_1_40	3
+
+/* KTU1125_SET_SW2_CFG bits and fields */
+#define KTU1125_OVP_BUS_SHIFT	0
+#define KTU1125_OVP_BUS_LEN	3
+#define KTU1125_DIS_RES_SHIFT	3
+#define KTU1125_DIS_RES_LEN	2
+#define KTU1125_VBUS_DIS_EN	BIT(5)
+#define KTU1125_T_HIC_SHIFT	6
+#define KTU1125_T_HIC_LEN	2
+
+/* VBUS Over Voltage Protection */
+#define KTU1125_SYSB_VLIM_25_00	0
+#define KTU1125_SYSB_VLIM_17_00	4
+#define KTU1125_SYSB_VLIM_13_75	5
+#define KTU1125_SYSB_VLIM_10_60	6
+#define KTU1125_SYSB_VLIM_6_00	7
+
+/* Discharge resistor [ohms] */
+#define KTU1125_DIS_RES_1400	0
+#define KTU1125_DIS_RES_730	1
+#define KTU1125_DIS_RES_570	2
+#define KTU1125_DIS_RES_205	3
+
+/* T _HIC values [ms] */
+#define KTU_T_HIC_MS_17		0
+#define KTU_T_HIC_MS_34		1
+#define KTU_T_HIC_MS_51		2
+#define KTU_T_HIC_MS_68		3
+
+/* Bits for MONITOR/INTMASK/INT SNK */
+#define KTU1125_SS_FAIL		BIT(0)
+#define KTU1125_OTP		BIT(1)
+#define KTU1125_FR_SWAP		BIT(2)
+#define KTU1125_SYSA_SCP	BIT(3)
+#define KTU1125_SYSA_OCP	BIT(4)
+#define KTU1125_VBUS_OVP	BIT(5)
+#define KTU1125_VBUS_UVLO	BIT(6)
+#define KTU1125_SYSA_OK		BIT(7)
+#define KTU1125_SNK_MASK_ALL	0xFF
+
+/* Bits for MONITOR/INTMASK/INT SRC */
+#define KTU1125_VCONN_SCP	BIT(0)
+#define KTU1125_VCONN_CLP	BIT(1)
+#define KTU1125_VCONN_UVLO	BIT(2)
+#define KTU1125_SYSB_SCP	BIT(3)
+#define KTU1125_SYSB_OCP	BIT(4)
+#define KTU1125_SYSB_CLP	BIT(5)
+#define KTU1125_SYSB_UVLO	BIT(6)
+#define KTU1125_VBUS_OK		BIT(7)
+#define KTU1125_SRC_MASK_ALL	0xFF
+
+/* Bits for MONITOR/INTMASK/INT DATA */
+#define KTU1125_SBUB		BIT(0)
+#define KTU1125_SBUA		BIT(1)
+#define KTU1125_SBU2_OVP	BIT(2)
+#define KTU1125_SBU1_OVP	BIT(3)
+#define KTU1125_CC2_OVP		BIT(4)
+#define KTU1125_CC1_OVP		BIT(5)
+#define KTU1125_CC2S_CLAMP	BIT(6)
+#define KTU1125_CC1S_CLAMP	BIT(7)
+#define KTU1125_DATA_MASK_ALL	0xFC
+
+#endif /* defined(__CROS_EC_KTU1125_H) */