1 files changed, 23 insertions, 2 deletions

diff --git a/drivers/usb/typec/tcpm/tcpci.h b/drivers/usb/typec/tcpm/tcpci.h
index 5ef07a56d67a..c3c7d07d9b4e 100644
--- a/drivers/usb/typec/tcpm/tcpci.h
+++ b/drivers/usb/typec/tcpm/tcpci.h
@@ -8,6 +8,8 @@
 #ifndef __LINUX_USB_TCPCI_H
 #define __LINUX_USB_TCPCI_H
 
+#include <linux/usb/typec.h>
+
 #define TCPC_VENDOR_ID                  0x0
 #define TCPC_PRODUCT_ID                 0x2
 #define TCPC_BCD_DEV                    0x4
@@ -47,6 +49,9 @@
 #define TCPC_TCPC_CTRL_ORIENTATION      BIT(0)
 #define TCPC_TCPC_CTRL_BIST_TM          BIT(1)
 
+#define TCPC_EXTENDED_STATUS            0x20
+#define TCPC_EXTENDED_STATUS_VSAFE0V    BIT(0)
+
 #define TCPC_ROLE_CTRL                  0x1a
 #define TCPC_ROLE_CTRL_DRP              BIT(6)
 #define TCPC_ROLE_CTRL_RP_VAL_SHIFT     4
@@ -67,6 +72,8 @@
 
 #define TCPC_POWER_CTRL                 0x1c
 #define TCPC_POWER_CTRL_VCONN_ENABLE    BIT(0)
+#define TCPC_POWER_CTRL_BLEED_DISCHARGE BIT(3)
+#define TCPC_POWER_CTRL_AUTO_DISCHARGE  BIT(4)
 #define TCPC_FAST_ROLE_SWAP_EN          BIT(7)
 
 #define TCPC_CC_STATUS                  0x1d
@@ -133,6 +140,8 @@
 
 #define TCPC_VBUS_VOLTAGE                       0x70
 #define TCPC_VBUS_SINK_DISCONNECT_THRESH        0x72
+#define TCPC_VBUS_SINK_DISCONNECT_THRESH_LSB_MV 25
+#define TCPC_VBUS_SINK_DISCONNECT_THRESH_MAX    0x3ff
 #define TCPC_VBUS_STOP_DISCHARGE_THRESH         0x74
 #define TCPC_VBUS_VOLTAGE_ALARM_HI_CFG          0x76
 #define TCPC_VBUS_VOLTAGE_ALARM_LO_CFG          0x78
@@ -140,20 +149,32 @@
 /* I2C_WRITE_BYTE_COUNT + 1 when TX_BUF_BYTE_x is only accessible I2C_WRITE_BYTE_COUNT */
 #define TCPC_TRANSMIT_BUFFER_MAX_LEN            31
 
+struct tcpci;
+
 /*
- * @TX_BUF_BYTE_x_hidden
+ * @TX_BUF_BYTE_x_hidden:
  *              optional; Set when TX_BUF_BYTE_x can only be accessed through I2C_WRITE_BYTE_COUNT.
+ * @frs_sourcing_vbus:
+ *              Optional; Callback to perform chip specific operations when FRS
+ *              is sourcing vbus.
+ * @auto_discharge_disconnect:
+ *              Optional; Enables TCPC to autonously discharge vbus on disconnect.
+ * @vbus_vsafe0v:
+ *              optional; Set when TCPC can detect whether vbus is at VSAFE0V.
  */
-struct tcpci;
 struct tcpci_data {
         struct regmap *regmap;
         unsigned char TX_BUF_BYTE_x_hidden:1;
+        unsigned char auto_discharge_disconnect:1;
+        unsigned char vbus_vsafe0v:1;
+
         int (*init)(struct tcpci *tcpci, struct tcpci_data *data);
         int (*set_vconn)(struct tcpci *tcpci, struct tcpci_data *data,
                          bool enable);
         int (*start_drp_toggling)(struct tcpci *tcpci, struct tcpci_data *data,
                                   enum typec_cc_status cc);
         int (*set_vbus)(struct tcpci *tcpci, struct tcpci_data *data, bool source, bool sink);
+        void (*frs_sourcing_vbus)(struct tcpci *tcpci, struct tcpci_data *data);
 };
 
 struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data);