]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
usb: typec: Group all TCPCI/TCPM code together
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>
Thu, 20 Sep 2018 11:23:47 +0000 (14:23 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Sep 2018 11:37:29 +0000 (13:37 +0200)
Moving all the drivers that depend on the Port Controller
Manager under a new directory drivers/usb/typec/tcpm/ and
making Guenter Roeck the designated reviewer of that code.

Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
21 files changed:
MAINTAINERS
drivers/usb/typec/Kconfig
drivers/usb/typec/Makefile
drivers/usb/typec/fusb302/Kconfig [deleted file]
drivers/usb/typec/fusb302/Makefile [deleted file]
drivers/usb/typec/fusb302/fusb302.c [deleted file]
drivers/usb/typec/fusb302/fusb302_reg.h [deleted file]
drivers/usb/typec/tcpci.c [deleted file]
drivers/usb/typec/tcpci.h [deleted file]
drivers/usb/typec/tcpci_rt1711h.c [deleted file]
drivers/usb/typec/tcpm.c [deleted file]
drivers/usb/typec/tcpm/Kconfig [new file with mode: 0644]
drivers/usb/typec/tcpm/Makefile [new file with mode: 0644]
drivers/usb/typec/tcpm/fusb302.c [new file with mode: 0644]
drivers/usb/typec/tcpm/fusb302_reg.h [new file with mode: 0644]
drivers/usb/typec/tcpm/tcpci.c [new file with mode: 0644]
drivers/usb/typec/tcpm/tcpci.h [new file with mode: 0644]
drivers/usb/typec/tcpm/tcpci_rt1711h.c [new file with mode: 0644]
drivers/usb/typec/tcpm/tcpm.c [new file with mode: 0644]
drivers/usb/typec/tcpm/wcove.c [new file with mode: 0644]
drivers/usb/typec/typec_wcove.c [deleted file]

index 4ece30f15777cecaf93bc2c362427ca4f46ad96e..9dff31e38fac8c92b1e77c55e32efcdc91200305 100644 (file)
@@ -15286,6 +15286,12 @@ F:     Documentation/driver-api/usb/typec_bus.rst
 F:     drivers/usb/typec/altmodes/
 F:     include/linux/usb/typec_altmode.h
 
+USB TYPEC PORT CONTROLLER DRIVERS
+M:     Guenter Roeck <linux@roeck-us.net>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/typec/tcpm/
+
 USB UHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
index 00878c386dd09d26a80f7aa30186a61d42700616..30a847c2089d09cf87e39efca8de8367a5bcc27d 100644 (file)
@@ -45,50 +45,7 @@ menuconfig TYPEC
 
 if TYPEC
 
-config TYPEC_TCPM
-       tristate "USB Type-C Port Controller Manager"
-       depends on USB
-       select USB_ROLE_SWITCH
-       select POWER_SUPPLY
-       help
-         The Type-C Port Controller Manager provides a USB PD and USB Type-C
-         state machine for use with Type-C Port Controllers.
-
-if TYPEC_TCPM
-
-config TYPEC_TCPCI
-       tristate "Type-C Port Controller Interface driver"
-       depends on I2C
-       select REGMAP_I2C
-       help
-         Type-C Port Controller driver for TCPCI-compliant controller.
-
-config TYPEC_RT1711H
-       tristate "Richtek RT1711H Type-C chip driver"
-       depends on I2C
-       select TYPEC_TCPCI
-       help
-         Richtek RT1711H Type-C chip driver that works with
-         Type-C Port Controller Manager to provide USB PD and USB
-         Type-C functionalities.
-
-source "drivers/usb/typec/fusb302/Kconfig"
-
-config TYPEC_WCOVE
-       tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
-       depends on ACPI
-       depends on INTEL_SOC_PMIC
-       depends on INTEL_PMC_IPC
-       depends on BXT_WC_PMIC_OPREGION
-       help
-         This driver adds support for USB Type-C detection on Intel Broxton
-         platforms that have Intel Whiskey Cove PMIC. The driver can detect the
-         role and cable orientation.
-
-         To compile this driver as module, choose M here: the module will be
-         called typec_wcove
-
-endif # TYPEC_TCPM
+source "drivers/usb/typec/tcpm/Kconfig"
 
 source "drivers/usb/typec/ucsi/Kconfig"
 
index 45b0aef428a82ac8dc77947a82bd261f850dee43..6696b7263d61a864c8d2f46d4b3bc1e373ae4dad 100644 (file)
@@ -2,11 +2,7 @@
 obj-$(CONFIG_TYPEC)            += typec.o
 typec-y                                := class.o mux.o bus.o
 obj-$(CONFIG_TYPEC)            += altmodes/
-obj-$(CONFIG_TYPEC_TCPM)       += tcpm.o
-obj-y                          += fusb302/
-obj-$(CONFIG_TYPEC_WCOVE)      += typec_wcove.o
+obj-$(CONFIG_TYPEC_TCPM)       += tcpm/
 obj-$(CONFIG_TYPEC_UCSI)       += ucsi/
 obj-$(CONFIG_TYPEC_TPS6598X)   += tps6598x.o
 obj-$(CONFIG_TYPEC)            += mux/
-obj-$(CONFIG_TYPEC_TCPCI)      += tcpci.o
-obj-$(CONFIG_TYPEC_RT1711H)    += tcpci_rt1711h.o
diff --git a/drivers/usb/typec/fusb302/Kconfig b/drivers/usb/typec/fusb302/Kconfig
deleted file mode 100644 (file)
index fce099f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-config TYPEC_FUSB302
-       tristate "Fairchild FUSB302 Type-C chip driver"
-       depends on I2C
-       help
-         The Fairchild FUSB302 Type-C chip driver that works with
-         Type-C Port Controller Manager to provide USB PD and USB
-         Type-C functionalities.
diff --git a/drivers/usb/typec/fusb302/Makefile b/drivers/usb/typec/fusb302/Makefile
deleted file mode 100644 (file)
index 3b51b33..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_TYPEC_FUSB302)    += fusb302.o
diff --git a/drivers/usb/typec/fusb302/fusb302.c b/drivers/usb/typec/fusb302/fusb302.c
deleted file mode 100644 (file)
index 6e9370a..0000000
+++ /dev/null
@@ -1,1861 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2016-2017 Google, Inc
- *
- * Fairchild FUSB302 Type-C Chip Driver
- */
-
-#include <linux/debugfs.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/extcon.h>
-#include <linux/gpio.h>
-#include <linux/i2c.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/of_device.h>
-#include <linux/of_gpio.h>
-#include <linux/pinctrl/consumer.h>
-#include <linux/proc_fs.h>
-#include <linux/regulator/consumer.h>
-#include <linux/sched/clock.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/usb/typec.h>
-#include <linux/usb/tcpm.h>
-#include <linux/usb/pd.h>
-#include <linux/workqueue.h>
-
-#include "fusb302_reg.h"
-
-/*
- * When the device is SNK, BC_LVL interrupt is used to monitor cc pins
- * for the current capability offered by the SRC. As FUSB302 chip fires
- * the BC_LVL interrupt on PD signalings, cc lvl should be handled after
- * a delay to avoid measuring on PD activities. The delay is slightly
- * longer than PD_T_PD_DEBPUNCE (10-20ms).
- */
-#define T_BC_LVL_DEBOUNCE_DELAY_MS 30
-
-enum toggling_mode {
-       TOGGLINE_MODE_OFF,
-       TOGGLING_MODE_DRP,
-       TOGGLING_MODE_SNK,
-       TOGGLING_MODE_SRC,
-};
-
-enum src_current_status {
-       SRC_CURRENT_DEFAULT,
-       SRC_CURRENT_MEDIUM,
-       SRC_CURRENT_HIGH,
-};
-
-static const u8 ra_mda_value[] = {
-       [SRC_CURRENT_DEFAULT] = 4,      /* 210mV */
-       [SRC_CURRENT_MEDIUM] = 9,       /* 420mV */
-       [SRC_CURRENT_HIGH] = 18,        /* 798mV */
-};
-
-static const u8 rd_mda_value[] = {
-       [SRC_CURRENT_DEFAULT] = 38,     /* 1638mV */
-       [SRC_CURRENT_MEDIUM] = 38,      /* 1638mV */
-       [SRC_CURRENT_HIGH] = 61,        /* 2604mV */
-};
-
-#define LOG_BUFFER_ENTRIES     1024
-#define LOG_BUFFER_ENTRY_SIZE  128
-
-struct fusb302_chip {
-       struct device *dev;
-       struct i2c_client *i2c_client;
-       struct tcpm_port *tcpm_port;
-       struct tcpc_dev tcpc_dev;
-       struct tcpc_config tcpc_config;
-
-       struct regulator *vbus;
-
-       int gpio_int_n;
-       int gpio_int_n_irq;
-       struct extcon_dev *extcon;
-
-       struct workqueue_struct *wq;
-       struct delayed_work bc_lvl_handler;
-
-       atomic_t pm_suspend;
-       atomic_t i2c_busy;
-
-       /* lock for sharing chip states */
-       struct mutex lock;
-
-       /* chip status */
-       enum toggling_mode toggling_mode;
-       enum src_current_status src_current_status;
-       bool intr_togdone;
-       bool intr_bc_lvl;
-       bool intr_comp_chng;
-
-       /* port status */
-       bool pull_up;
-       bool vconn_on;
-       bool vbus_on;
-       bool charge_on;
-       bool vbus_present;
-       enum typec_cc_polarity cc_polarity;
-       enum typec_cc_status cc1;
-       enum typec_cc_status cc2;
-       u32 snk_pdo[PDO_MAX_OBJECTS];
-
-#ifdef CONFIG_DEBUG_FS
-       struct dentry *dentry;
-       /* lock for log buffer access */
-       struct mutex logbuffer_lock;
-       int logbuffer_head;
-       int logbuffer_tail;
-       u8 *logbuffer[LOG_BUFFER_ENTRIES];
-#endif
-};
-
-/*
- * Logging
- */
-
-#ifdef CONFIG_DEBUG_FS
-
-static bool fusb302_log_full(struct fusb302_chip *chip)
-{
-       return chip->logbuffer_tail ==
-               (chip->logbuffer_head + 1) % LOG_BUFFER_ENTRIES;
-}
-
-static void _fusb302_log(struct fusb302_chip *chip, const char *fmt,
-                        va_list args)
-{
-       char tmpbuffer[LOG_BUFFER_ENTRY_SIZE];
-       u64 ts_nsec = local_clock();
-       unsigned long rem_nsec;
-
-       if (!chip->logbuffer[chip->logbuffer_head]) {
-               chip->logbuffer[chip->logbuffer_head] =
-                               kzalloc(LOG_BUFFER_ENTRY_SIZE, GFP_KERNEL);
-               if (!chip->logbuffer[chip->logbuffer_head])
-                       return;
-       }
-
-       vsnprintf(tmpbuffer, sizeof(tmpbuffer), fmt, args);
-
-       mutex_lock(&chip->logbuffer_lock);
-
-       if (fusb302_log_full(chip)) {
-               chip->logbuffer_head = max(chip->logbuffer_head - 1, 0);
-               strlcpy(tmpbuffer, "overflow", sizeof(tmpbuffer));
-       }
-
-       if (chip->logbuffer_head < 0 ||
-           chip->logbuffer_head >= LOG_BUFFER_ENTRIES) {
-               dev_warn(chip->dev,
-                        "Bad log buffer index %d\n", chip->logbuffer_head);
-               goto abort;
-       }
-
-       if (!chip->logbuffer[chip->logbuffer_head]) {
-               dev_warn(chip->dev,
-                        "Log buffer index %d is NULL\n", chip->logbuffer_head);
-               goto abort;
-       }
-
-       rem_nsec = do_div(ts_nsec, 1000000000);
-       scnprintf(chip->logbuffer[chip->logbuffer_head],
-                 LOG_BUFFER_ENTRY_SIZE, "[%5lu.%06lu] %s",
-                 (unsigned long)ts_nsec, rem_nsec / 1000,
-                 tmpbuffer);
-       chip->logbuffer_head = (chip->logbuffer_head + 1) % LOG_BUFFER_ENTRIES;
-
-abort:
-       mutex_unlock(&chip->logbuffer_lock);
-}
-
-static void fusb302_log(struct fusb302_chip *chip, const char *fmt, ...)
-{
-       va_list args;
-
-       va_start(args, fmt);
-       _fusb302_log(chip, fmt, args);
-       va_end(args);
-}
-
-static int fusb302_debug_show(struct seq_file *s, void *v)
-{
-       struct fusb302_chip *chip = (struct fusb302_chip *)s->private;
-       int tail;
-
-       mutex_lock(&chip->logbuffer_lock);
-       tail = chip->logbuffer_tail;
-       while (tail != chip->logbuffer_head) {
-               seq_printf(s, "%s\n", chip->logbuffer[tail]);
-               tail = (tail + 1) % LOG_BUFFER_ENTRIES;
-       }
-       if (!seq_has_overflowed(s))
-               chip->logbuffer_tail = tail;
-       mutex_unlock(&chip->logbuffer_lock);
-
-       return 0;
-}
-DEFINE_SHOW_ATTRIBUTE(fusb302_debug);
-
-static struct dentry *rootdir;
-
-static void fusb302_debugfs_init(struct fusb302_chip *chip)
-{
-       mutex_init(&chip->logbuffer_lock);
-       if (!rootdir)
-               rootdir = debugfs_create_dir("fusb302", NULL);
-
-       chip->dentry = debugfs_create_file(dev_name(chip->dev),
-                                          S_IFREG | 0444, rootdir,
-                                          chip, &fusb302_debug_fops);
-}
-
-static void fusb302_debugfs_exit(struct fusb302_chip *chip)
-{
-       debugfs_remove(chip->dentry);
-       debugfs_remove(rootdir);
-}
-
-#else
-
-static void fusb302_log(const struct fusb302_chip *chip,
-                       const char *fmt, ...) { }
-static void fusb302_debugfs_init(const struct fusb302_chip *chip) { }
-static void fusb302_debugfs_exit(const struct fusb302_chip *chip) { }
-
-#endif
-
-#define FUSB302_RESUME_RETRY 10
-#define FUSB302_RESUME_RETRY_SLEEP 50
-
-static bool fusb302_is_suspended(struct fusb302_chip *chip)
-{
-       int retry_cnt;
-
-       for (retry_cnt = 0; retry_cnt < FUSB302_RESUME_RETRY; retry_cnt++) {
-               if (atomic_read(&chip->pm_suspend)) {
-                       dev_err(chip->dev, "i2c: pm suspend, retry %d/%d\n",
-                               retry_cnt + 1, FUSB302_RESUME_RETRY);
-                       msleep(FUSB302_RESUME_RETRY_SLEEP);
-               } else {
-                       return false;
-               }
-       }
-
-       return true;
-}
-
-static int fusb302_i2c_write(struct fusb302_chip *chip,
-                            u8 address, u8 data)
-{
-       int ret = 0;
-
-       atomic_set(&chip->i2c_busy, 1);
-
-       if (fusb302_is_suspended(chip)) {
-               atomic_set(&chip->i2c_busy, 0);
-               return -ETIMEDOUT;
-       }
-
-       ret = i2c_smbus_write_byte_data(chip->i2c_client, address, data);
-       if (ret < 0)
-               fusb302_log(chip, "cannot write 0x%02x to 0x%02x, ret=%d",
-                           data, address, ret);
-       atomic_set(&chip->i2c_busy, 0);
-
-       return ret;
-}
-
-static int fusb302_i2c_block_write(struct fusb302_chip *chip, u8 address,
-                                  u8 length, const u8 *data)
-{
-       int ret = 0;
-
-       if (length <= 0)
-               return ret;
-       atomic_set(&chip->i2c_busy, 1);
-
-       if (fusb302_is_suspended(chip)) {
-               atomic_set(&chip->i2c_busy, 0);
-               return -ETIMEDOUT;
-       }
-
-       ret = i2c_smbus_write_i2c_block_data(chip->i2c_client, address,
-                                            length, data);
-       if (ret < 0)
-               fusb302_log(chip, "cannot block write 0x%02x, len=%d, ret=%d",
-                           address, length, ret);
-       atomic_set(&chip->i2c_busy, 0);
-
-       return ret;
-}
-
-static int fusb302_i2c_read(struct fusb302_chip *chip,
-                           u8 address, u8 *data)
-{
-       int ret = 0;
-
-       atomic_set(&chip->i2c_busy, 1);
-
-       if (fusb302_is_suspended(chip)) {
-               atomic_set(&chip->i2c_busy, 0);
-               return -ETIMEDOUT;
-       }
-
-       ret = i2c_smbus_read_byte_data(chip->i2c_client, address);
-       *data = (u8)ret;
-       if (ret < 0)
-               fusb302_log(chip, "cannot read %02x, ret=%d", address, ret);
-       atomic_set(&chip->i2c_busy, 0);
-
-       return ret;
-}
-
-static int fusb302_i2c_block_read(struct fusb302_chip *chip, u8 address,
-                                 u8 length, u8 *data)
-{
-       int ret = 0;
-
-       if (length <= 0)
-               return ret;
-       atomic_set(&chip->i2c_busy, 1);
-
-       if (fusb302_is_suspended(chip)) {
-               atomic_set(&chip->i2c_busy, 0);
-               return -ETIMEDOUT;
-       }
-
-       ret = i2c_smbus_read_i2c_block_data(chip->i2c_client, address,
-                                           length, data);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot block read 0x%02x, len=%d, ret=%d",
-                           address, length, ret);
-               goto done;
-       }
-       if (ret != length) {
-               fusb302_log(chip, "only read %d/%d bytes from 0x%02x",
-                           ret, length, address);
-               ret = -EIO;
-       }
-
-done:
-       atomic_set(&chip->i2c_busy, 0);
-
-       return ret;
-}
-
-static int fusb302_i2c_mask_write(struct fusb302_chip *chip, u8 address,
-                                 u8 mask, u8 value)
-{
-       int ret = 0;
-       u8 data;
-
-       ret = fusb302_i2c_read(chip, address, &data);
-       if (ret < 0)
-               return ret;
-       data &= ~mask;
-       data |= value;
-       ret = fusb302_i2c_write(chip, address, data);
-       if (ret < 0)
-               return ret;
-
-       return ret;
-}
-
-static int fusb302_i2c_set_bits(struct fusb302_chip *chip, u8 address,
-                               u8 set_bits)
-{
-       return fusb302_i2c_mask_write(chip, address, 0x00, set_bits);
-}
-
-static int fusb302_i2c_clear_bits(struct fusb302_chip *chip, u8 address,
-                                 u8 clear_bits)
-{
-       return fusb302_i2c_mask_write(chip, address, clear_bits, 0x00);
-}
-
-static int fusb302_sw_reset(struct fusb302_chip *chip)
-{
-       int ret = 0;
-
-       ret = fusb302_i2c_write(chip, FUSB_REG_RESET,
-                               FUSB_REG_RESET_SW_RESET);
-       if (ret < 0)
-               fusb302_log(chip, "cannot sw reset the chip, ret=%d", ret);
-       else
-               fusb302_log(chip, "sw reset");
-
-       return ret;
-}
-
-static int fusb302_enable_tx_auto_retries(struct fusb302_chip *chip)
-{
-       int ret = 0;
-
-       ret = fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL3,
-                                  FUSB_REG_CONTROL3_N_RETRIES_3 |
-                                  FUSB_REG_CONTROL3_AUTO_RETRY);
-
-       return ret;
-}
-
-/*
- * initialize interrupt on the chip
- * - unmasked interrupt: VBUS_OK
- */
-static int fusb302_init_interrupt(struct fusb302_chip *chip)
-{
-       int ret = 0;
-
-       ret = fusb302_i2c_write(chip, FUSB_REG_MASK,
-                               0xFF & ~FUSB_REG_MASK_VBUSOK);
-       if (ret < 0)
-               return ret;
-       ret = fusb302_i2c_write(chip, FUSB_REG_MASKA, 0xFF);
-       if (ret < 0)
-               return ret;
-       ret = fusb302_i2c_write(chip, FUSB_REG_MASKB, 0xFF);
-       if (ret < 0)
-               return ret;
-       ret = fusb302_i2c_clear_bits(chip, FUSB_REG_CONTROL0,
-                                    FUSB_REG_CONTROL0_INT_MASK);
-       if (ret < 0)
-               return ret;
-
-       return ret;
-}
-
-static int fusb302_set_power_mode(struct fusb302_chip *chip, u8 power_mode)
-{
-       int ret = 0;
-
-       ret = fusb302_i2c_write(chip, FUSB_REG_POWER, power_mode);
-
-       return ret;
-}
-
-static int tcpm_init(struct tcpc_dev *dev)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int ret = 0;
-       u8 data;
-
-       ret = fusb302_sw_reset(chip);
-       if (ret < 0)
-               return ret;
-       ret = fusb302_enable_tx_auto_retries(chip);
-       if (ret < 0)
-               return ret;
-       ret = fusb302_init_interrupt(chip);
-       if (ret < 0)
-               return ret;
-       ret = fusb302_set_power_mode(chip, FUSB_REG_POWER_PWR_ALL);
-       if (ret < 0)
-               return ret;
-       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &data);
-       if (ret < 0)
-               return ret;
-       chip->vbus_present = !!(data & FUSB_REG_STATUS0_VBUSOK);
-       ret = fusb302_i2c_read(chip, FUSB_REG_DEVICE_ID, &data);
-       if (ret < 0)
-               return ret;
-       fusb302_log(chip, "fusb302 device ID: 0x%02x", data);
-
-       return ret;
-}
-
-static int tcpm_get_vbus(struct tcpc_dev *dev)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int ret = 0;
-
-       mutex_lock(&chip->lock);
-       ret = chip->vbus_present ? 1 : 0;
-       mutex_unlock(&chip->lock);
-
-       return ret;
-}
-
-static int tcpm_get_current_limit(struct tcpc_dev *dev)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int current_limit = 0;
-       unsigned long timeout;
-
-       if (!chip->extcon)
-               return 0;
-
-       /*
-        * USB2 Charger detection may still be in progress when we get here,
-        * this can take upto 600ms, wait 800ms max.
-        */
-       timeout = jiffies + msecs_to_jiffies(800);
-       do {
-               if (extcon_get_state(chip->extcon, EXTCON_CHG_USB_SDP) == 1)
-                       current_limit = 500;
-
-               if (extcon_get_state(chip->extcon, EXTCON_CHG_USB_CDP) == 1 ||
-                   extcon_get_state(chip->extcon, EXTCON_CHG_USB_ACA) == 1)
-                       current_limit = 1500;
-
-               if (extcon_get_state(chip->extcon, EXTCON_CHG_USB_DCP) == 1)
-                       current_limit = 2000;
-
-               msleep(50);
-       } while (current_limit == 0 && time_before(jiffies, timeout));
-
-       return current_limit;
-}
-
-static int fusb302_set_cc_pull(struct fusb302_chip *chip,
-                              bool pull_up, bool pull_down)
-{
-       int ret = 0;
-       u8 data = 0x00;
-       u8 mask = FUSB_REG_SWITCHES0_CC1_PU_EN |
-                 FUSB_REG_SWITCHES0_CC2_PU_EN |
-                 FUSB_REG_SWITCHES0_CC1_PD_EN |
-                 FUSB_REG_SWITCHES0_CC2_PD_EN;
-
-       if (pull_up)
-               data |= (chip->cc_polarity == TYPEC_POLARITY_CC1) ?
-                       FUSB_REG_SWITCHES0_CC1_PU_EN :
-                       FUSB_REG_SWITCHES0_CC2_PU_EN;
-       if (pull_down)
-               data |= FUSB_REG_SWITCHES0_CC1_PD_EN |
-                       FUSB_REG_SWITCHES0_CC2_PD_EN;
-       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0,
-                                    mask, data);
-       if (ret < 0)
-               return ret;
-       chip->pull_up = pull_up;
-
-       return ret;
-}
-
-static int fusb302_set_src_current(struct fusb302_chip *chip,
-                                  enum src_current_status status)
-{
-       int ret = 0;
-
-       chip->src_current_status = status;
-       switch (status) {
-       case SRC_CURRENT_DEFAULT:
-               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL0,
-                                            FUSB_REG_CONTROL0_HOST_CUR_MASK,
-                                            FUSB_REG_CONTROL0_HOST_CUR_DEF);
-               break;
-       case SRC_CURRENT_MEDIUM:
-               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL0,
-                                            FUSB_REG_CONTROL0_HOST_CUR_MASK,
-                                            FUSB_REG_CONTROL0_HOST_CUR_MED);
-               break;
-       case SRC_CURRENT_HIGH:
-               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL0,
-                                            FUSB_REG_CONTROL0_HOST_CUR_MASK,
-                                            FUSB_REG_CONTROL0_HOST_CUR_HIGH);
-               break;
-       default:
-               break;
-       }
-
-       return ret;
-}
-
-static int fusb302_set_toggling(struct fusb302_chip *chip,
-                               enum toggling_mode mode)
-{
-       int ret = 0;
-
-       /* first disable toggling */
-       ret = fusb302_i2c_clear_bits(chip, FUSB_REG_CONTROL2,
-                                    FUSB_REG_CONTROL2_TOGGLE);
-       if (ret < 0)
-               return ret;
-       /* mask interrupts for SRC or SNK */
-       ret = fusb302_i2c_set_bits(chip, FUSB_REG_MASK,
-                                  FUSB_REG_MASK_BC_LVL |
-                                  FUSB_REG_MASK_COMP_CHNG);
-       if (ret < 0)
-               return ret;
-       chip->intr_bc_lvl = false;
-       chip->intr_comp_chng = false;
-       /* configure toggling mode: none/snk/src/drp */
-       switch (mode) {
-       case TOGGLINE_MODE_OFF:
-               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL2,
-                                            FUSB_REG_CONTROL2_MODE_MASK,
-                                            FUSB_REG_CONTROL2_MODE_NONE);
-               if (ret < 0)
-                       return ret;
-               break;
-       case TOGGLING_MODE_SNK:
-               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL2,
-                                            FUSB_REG_CONTROL2_MODE_MASK,
-                                            FUSB_REG_CONTROL2_MODE_UFP);
-               if (ret < 0)
-                       return ret;
-               break;
-       case TOGGLING_MODE_SRC:
-               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL2,
-                                            FUSB_REG_CONTROL2_MODE_MASK,
-                                            FUSB_REG_CONTROL2_MODE_DFP);
-               if (ret < 0)
-                       return ret;
-               break;
-       case TOGGLING_MODE_DRP:
-               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL2,
-                                            FUSB_REG_CONTROL2_MODE_MASK,
-                                            FUSB_REG_CONTROL2_MODE_DRP);
-               if (ret < 0)
-                       return ret;
-               break;
-       default:
-               break;
-       }
-
-       if (mode == TOGGLINE_MODE_OFF) {
-               /* mask TOGDONE interrupt */
-               ret = fusb302_i2c_set_bits(chip, FUSB_REG_MASKA,
-                                          FUSB_REG_MASKA_TOGDONE);
-               if (ret < 0)
-                       return ret;
-               chip->intr_togdone = false;
-       } else {
-               /* unmask TOGDONE interrupt */
-               ret = fusb302_i2c_clear_bits(chip, FUSB_REG_MASKA,
-                                            FUSB_REG_MASKA_TOGDONE);
-               if (ret < 0)
-                       return ret;
-               chip->intr_togdone = true;
-               /* start toggling */
-               ret = fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL2,
-                                          FUSB_REG_CONTROL2_TOGGLE);
-               if (ret < 0)
-                       return ret;
-               /* during toggling, consider cc as Open */
-               chip->cc1 = TYPEC_CC_OPEN;
-               chip->cc2 = TYPEC_CC_OPEN;
-       }
-       chip->toggling_mode = mode;
-
-       return ret;
-}
-
-static const char * const typec_cc_status_name[] = {
-       [TYPEC_CC_OPEN]         = "Open",
-       [TYPEC_CC_RA]           = "Ra",
-       [TYPEC_CC_RD]           = "Rd",
-       [TYPEC_CC_RP_DEF]       = "Rp-def",
-       [TYPEC_CC_RP_1_5]       = "Rp-1.5",
-       [TYPEC_CC_RP_3_0]       = "Rp-3.0",
-};
-
-static const enum src_current_status cc_src_current[] = {
-       [TYPEC_CC_OPEN]         = SRC_CURRENT_DEFAULT,
-       [TYPEC_CC_RA]           = SRC_CURRENT_DEFAULT,
-       [TYPEC_CC_RD]           = SRC_CURRENT_DEFAULT,
-       [TYPEC_CC_RP_DEF]       = SRC_CURRENT_DEFAULT,
-       [TYPEC_CC_RP_1_5]       = SRC_CURRENT_MEDIUM,
-       [TYPEC_CC_RP_3_0]       = SRC_CURRENT_HIGH,
-};
-
-static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int ret = 0;
-       bool pull_up, pull_down;
-       u8 rd_mda;
-
-       mutex_lock(&chip->lock);
-       switch (cc) {
-       case TYPEC_CC_OPEN:
-               pull_up = false;
-               pull_down = false;
-               break;
-       case TYPEC_CC_RD:
-               pull_up = false;
-               pull_down = true;
-               break;
-       case TYPEC_CC_RP_DEF:
-       case TYPEC_CC_RP_1_5:
-       case TYPEC_CC_RP_3_0:
-               pull_up = true;
-               pull_down = false;
-               break;
-       default:
-               fusb302_log(chip, "unsupported cc value %s",
-                           typec_cc_status_name[cc]);
-               ret = -EINVAL;
-               goto done;
-       }
-       ret = fusb302_set_toggling(chip, TOGGLINE_MODE_OFF);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot stop toggling, ret=%d", ret);
-               goto done;
-       }
-       ret = fusb302_set_cc_pull(chip, pull_up, pull_down);
-       if (ret < 0) {
-               fusb302_log(chip,
-                           "cannot set cc pulling up %s, down %s, ret = %d",
-                           pull_up ? "True" : "False",
-                           pull_down ? "True" : "False",
-                           ret);
-               goto done;
-       }
-       /* reset the cc status */
-       chip->cc1 = TYPEC_CC_OPEN;
-       chip->cc2 = TYPEC_CC_OPEN;
-       /* adjust current for SRC */
-       if (pull_up) {
-               ret = fusb302_set_src_current(chip, cc_src_current[cc]);
-               if (ret < 0) {
-                       fusb302_log(chip, "cannot set src current %s, ret=%d",
-                                   typec_cc_status_name[cc], ret);
-                       goto done;
-               }
-       }
-       /* enable/disable interrupts, BC_LVL for SNK and COMP_CHNG for SRC */
-       if (pull_up) {
-               rd_mda = rd_mda_value[cc_src_current[cc]];
-               ret = fusb302_i2c_write(chip, FUSB_REG_MEASURE, rd_mda);
-               if (ret < 0) {
-                       fusb302_log(chip,
-                                   "cannot set SRC measure value, ret=%d",
-                                   ret);
-                       goto done;
-               }
-               ret = fusb302_i2c_mask_write(chip, FUSB_REG_MASK,
-                                            FUSB_REG_MASK_BC_LVL |
-                                            FUSB_REG_MASK_COMP_CHNG,
-                                            FUSB_REG_MASK_COMP_CHNG);
-               if (ret < 0) {
-                       fusb302_log(chip, "cannot set SRC interrupt, ret=%d",
-                                   ret);
-                       goto done;
-               }
-               chip->intr_bc_lvl = false;
-               chip->intr_comp_chng = true;
-       }
-       if (pull_down) {
-               ret = fusb302_i2c_mask_write(chip, FUSB_REG_MASK,
-                                            FUSB_REG_MASK_BC_LVL |
-                                            FUSB_REG_MASK_COMP_CHNG,
-                                            FUSB_REG_MASK_BC_LVL);
-               if (ret < 0) {
-                       fusb302_log(chip, "cannot set SRC interrupt, ret=%d",
-                                   ret);
-                       goto done;
-               }
-               chip->intr_bc_lvl = true;
-               chip->intr_comp_chng = false;
-       }
-       fusb302_log(chip, "cc := %s", typec_cc_status_name[cc]);
-done:
-       mutex_unlock(&chip->lock);
-
-       return ret;
-}
-
-static int tcpm_get_cc(struct tcpc_dev *dev, enum typec_cc_status *cc1,
-                      enum typec_cc_status *cc2)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-
-       mutex_lock(&chip->lock);
-       *cc1 = chip->cc1;
-       *cc2 = chip->cc2;
-       fusb302_log(chip, "cc1=%s, cc2=%s", typec_cc_status_name[*cc1],
-                   typec_cc_status_name[*cc2]);
-       mutex_unlock(&chip->lock);
-
-       return 0;
-}
-
-static int tcpm_set_polarity(struct tcpc_dev *dev,
-                            enum typec_cc_polarity polarity)
-{
-       return 0;
-}
-
-static int tcpm_set_vconn(struct tcpc_dev *dev, bool on)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int ret = 0;
-       u8 switches0_data = 0x00;
-       u8 switches0_mask = FUSB_REG_SWITCHES0_VCONN_CC1 |
-                           FUSB_REG_SWITCHES0_VCONN_CC2;
-
-       mutex_lock(&chip->lock);
-       if (chip->vconn_on == on) {
-               fusb302_log(chip, "vconn is already %s", on ? "On" : "Off");
-               goto done;
-       }
-       if (on) {
-               switches0_data = (chip->cc_polarity == TYPEC_POLARITY_CC1) ?
-                                FUSB_REG_SWITCHES0_VCONN_CC2 :
-                                FUSB_REG_SWITCHES0_VCONN_CC1;
-       }
-       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0,
-                                    switches0_mask, switches0_data);
-       if (ret < 0)
-               goto done;
-       chip->vconn_on = on;
-       fusb302_log(chip, "vconn := %s", on ? "On" : "Off");
-done:
-       mutex_unlock(&chip->lock);
-
-       return ret;
-}
-
-static int tcpm_set_vbus(struct tcpc_dev *dev, bool on, bool charge)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int ret = 0;
-
-       mutex_lock(&chip->lock);
-       if (chip->vbus_on == on) {
-               fusb302_log(chip, "vbus is already %s", on ? "On" : "Off");
-       } else {
-               if (on)
-                       ret = regulator_enable(chip->vbus);
-               else
-                       ret = regulator_disable(chip->vbus);
-               if (ret < 0) {
-                       fusb302_log(chip, "cannot %s vbus regulator, ret=%d",
-                                   on ? "enable" : "disable", ret);
-                       goto done;
-               }
-               chip->vbus_on = on;
-               fusb302_log(chip, "vbus := %s", on ? "On" : "Off");
-       }
-       if (chip->charge_on == charge)
-               fusb302_log(chip, "charge is already %s",
-                           charge ? "On" : "Off");
-       else
-               chip->charge_on = charge;
-
-done:
-       mutex_unlock(&chip->lock);
-
-       return ret;
-}
-
-static int fusb302_pd_tx_flush(struct fusb302_chip *chip)
-{
-       return fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL0,
-                                   FUSB_REG_CONTROL0_TX_FLUSH);
-}
-
-static int fusb302_pd_rx_flush(struct fusb302_chip *chip)
-{
-       return fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL1,
-                                   FUSB_REG_CONTROL1_RX_FLUSH);
-}
-
-static int fusb302_pd_set_auto_goodcrc(struct fusb302_chip *chip, bool on)
-{
-       if (on)
-               return fusb302_i2c_set_bits(chip, FUSB_REG_SWITCHES1,
-                                           FUSB_REG_SWITCHES1_AUTO_GCRC);
-       return fusb302_i2c_clear_bits(chip, FUSB_REG_SWITCHES1,
-                                           FUSB_REG_SWITCHES1_AUTO_GCRC);
-}
-
-static int fusb302_pd_set_interrupts(struct fusb302_chip *chip, bool on)
-{
-       int ret = 0;
-       u8 mask_interrupts = FUSB_REG_MASK_COLLISION;
-       u8 maska_interrupts = FUSB_REG_MASKA_RETRYFAIL |
-                             FUSB_REG_MASKA_HARDSENT |
-                             FUSB_REG_MASKA_TX_SUCCESS |
-                             FUSB_REG_MASKA_HARDRESET;
-       u8 maskb_interrupts = FUSB_REG_MASKB_GCRCSENT;
-
-       ret = on ?
-               fusb302_i2c_clear_bits(chip, FUSB_REG_MASK, mask_interrupts) :
-               fusb302_i2c_set_bits(chip, FUSB_REG_MASK, mask_interrupts);
-       if (ret < 0)
-               return ret;
-       ret = on ?
-               fusb302_i2c_clear_bits(chip, FUSB_REG_MASKA, maska_interrupts) :
-               fusb302_i2c_set_bits(chip, FUSB_REG_MASKA, maska_interrupts);
-       if (ret < 0)
-               return ret;
-       ret = on ?
-               fusb302_i2c_clear_bits(chip, FUSB_REG_MASKB, maskb_interrupts) :
-               fusb302_i2c_set_bits(chip, FUSB_REG_MASKB, maskb_interrupts);
-       return ret;
-}
-
-static int tcpm_set_pd_rx(struct tcpc_dev *dev, bool on)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int ret = 0;
-
-       mutex_lock(&chip->lock);
-       ret = fusb302_pd_rx_flush(chip);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot flush pd rx buffer, ret=%d", ret);
-               goto done;
-       }
-       ret = fusb302_pd_tx_flush(chip);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot flush pd tx buffer, ret=%d", ret);
-               goto done;
-       }
-       ret = fusb302_pd_set_auto_goodcrc(chip, on);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot turn %s auto GCRC, ret=%d",
-                           on ? "on" : "off", ret);
-               goto done;
-       }
-       ret = fusb302_pd_set_interrupts(chip, on);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot turn %s pd interrupts, ret=%d",
-                           on ? "on" : "off", ret);
-               goto done;
-       }
-       fusb302_log(chip, "pd := %s", on ? "on" : "off");
-done:
-       mutex_unlock(&chip->lock);
-
-       return ret;
-}
-
-static const char * const typec_role_name[] = {
-       [TYPEC_SINK]            = "Sink",
-       [TYPEC_SOURCE]          = "Source",
-};
-
-static const char * const typec_data_role_name[] = {
-       [TYPEC_DEVICE]          = "Device",
-       [TYPEC_HOST]            = "Host",
-};
-
-static int tcpm_set_roles(struct tcpc_dev *dev, bool attached,
-                         enum typec_role pwr, enum typec_data_role data)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int ret = 0;
-       u8 switches1_mask = FUSB_REG_SWITCHES1_POWERROLE |
-                           FUSB_REG_SWITCHES1_DATAROLE;
-       u8 switches1_data = 0x00;
-
-       mutex_lock(&chip->lock);
-       if (pwr == TYPEC_SOURCE)
-               switches1_data |= FUSB_REG_SWITCHES1_POWERROLE;
-       if (data == TYPEC_HOST)
-               switches1_data |= FUSB_REG_SWITCHES1_DATAROLE;
-       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES1,
-                                    switches1_mask, switches1_data);
-       if (ret < 0) {
-               fusb302_log(chip, "unable to set pd header %s, %s, ret=%d",
-                           typec_role_name[pwr], typec_data_role_name[data],
-                           ret);
-               goto done;
-       }
-       fusb302_log(chip, "pd header := %s, %s", typec_role_name[pwr],
-                   typec_data_role_name[data]);
-done:
-       mutex_unlock(&chip->lock);
-
-       return ret;
-}
-
-static int tcpm_start_drp_toggling(struct tcpc_dev *dev,
-                                  enum typec_cc_status cc)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int ret = 0;
-
-       mutex_lock(&chip->lock);
-       ret = fusb302_set_src_current(chip, cc_src_current[cc]);
-       if (ret < 0) {
-               fusb302_log(chip, "unable to set src current %s, ret=%d",
-                           typec_cc_status_name[cc], ret);
-               goto done;
-       }
-       ret = fusb302_set_toggling(chip, TOGGLING_MODE_DRP);
-       if (ret < 0) {
-               fusb302_log(chip,
-                           "unable to start drp toggling, ret=%d", ret);
-               goto done;
-       }
-       fusb302_log(chip, "start drp toggling");
-done:
-       mutex_unlock(&chip->lock);
-
-       return ret;
-}
-
-static int fusb302_pd_send_message(struct fusb302_chip *chip,
-                                  const struct pd_message *msg)
-{
-       int ret = 0;
-       u8 buf[40];
-       u8 pos = 0;
-       int len;
-
-       /* SOP tokens */
-       buf[pos++] = FUSB302_TKN_SYNC1;
-       buf[pos++] = FUSB302_TKN_SYNC1;
-       buf[pos++] = FUSB302_TKN_SYNC1;
-       buf[pos++] = FUSB302_TKN_SYNC2;
-
-       len = pd_header_cnt_le(msg->header) * 4;
-       /* plug 2 for header */
-       len += 2;
-       if (len > 0x1F) {
-               fusb302_log(chip,
-                           "PD message too long %d (incl. header)", len);
-               return -EINVAL;
-       }
-       /* packsym tells the FUSB302 chip that the next X bytes are payload */
-       buf[pos++] = FUSB302_TKN_PACKSYM | (len & 0x1F);
-       memcpy(&buf[pos], &msg->header, sizeof(msg->header));
-       pos += sizeof(msg->header);
-
-       len -= 2;
-       memcpy(&buf[pos], msg->payload, len);
-       pos += len;
-
-       /* CRC */
-       buf[pos++] = FUSB302_TKN_JAMCRC;
-       /* EOP */
-       buf[pos++] = FUSB302_TKN_EOP;
-       /* turn tx off after sending message */
-       buf[pos++] = FUSB302_TKN_TXOFF;
-       /* start transmission */
-       buf[pos++] = FUSB302_TKN_TXON;
-
-       ret = fusb302_i2c_block_write(chip, FUSB_REG_FIFOS, pos, buf);
-       if (ret < 0)
-               return ret;
-       fusb302_log(chip, "sending PD message header: %x", msg->header);
-       fusb302_log(chip, "sending PD message len: %d", len);
-
-       return ret;
-}
-
-static int fusb302_pd_send_hardreset(struct fusb302_chip *chip)
-{
-       return fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL3,
-                                   FUSB_REG_CONTROL3_SEND_HARDRESET);
-}
-
-static const char * const transmit_type_name[] = {
-       [TCPC_TX_SOP]                   = "SOP",
-       [TCPC_TX_SOP_PRIME]             = "SOP'",
-       [TCPC_TX_SOP_PRIME_PRIME]       = "SOP''",
-       [TCPC_TX_SOP_DEBUG_PRIME]       = "DEBUG'",
-       [TCPC_TX_SOP_DEBUG_PRIME_PRIME] = "DEBUG''",
-       [TCPC_TX_HARD_RESET]            = "HARD_RESET",
-       [TCPC_TX_CABLE_RESET]           = "CABLE_RESET",
-       [TCPC_TX_BIST_MODE_2]           = "BIST_MODE_2",
-};
-
-static int tcpm_pd_transmit(struct tcpc_dev *dev, enum tcpm_transmit_type type,
-                           const struct pd_message *msg)
-{
-       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
-                                                tcpc_dev);
-       int ret = 0;
-
-       mutex_lock(&chip->lock);
-       switch (type) {
-       case TCPC_TX_SOP:
-               ret = fusb302_pd_send_message(chip, msg);
-               if (ret < 0)
-                       fusb302_log(chip,
-                                   "cannot send PD message, ret=%d", ret);
-               break;
-       case TCPC_TX_HARD_RESET:
-               ret = fusb302_pd_send_hardreset(chip);
-               if (ret < 0)
-                       fusb302_log(chip,
-                                   "cannot send hardreset, ret=%d", ret);
-               break;
-       default:
-               fusb302_log(chip, "type %s not supported",
-                           transmit_type_name[type]);
-               ret = -EINVAL;
-       }
-       mutex_unlock(&chip->lock);
-
-       return ret;
-}
-
-static enum typec_cc_status fusb302_bc_lvl_to_cc(u8 bc_lvl)
-{
-       if (bc_lvl == FUSB_REG_STATUS0_BC_LVL_1230_MAX)
-               return TYPEC_CC_RP_3_0;
-       if (bc_lvl == FUSB_REG_STATUS0_BC_LVL_600_1230)
-               return TYPEC_CC_RP_1_5;
-       if (bc_lvl == FUSB_REG_STATUS0_BC_LVL_200_600)
-               return TYPEC_CC_RP_DEF;
-       return TYPEC_CC_OPEN;
-}
-
-static void fusb302_bc_lvl_handler_work(struct work_struct *work)
-{
-       struct fusb302_chip *chip = container_of(work, struct fusb302_chip,
-                                                bc_lvl_handler.work);
-       int ret = 0;
-       u8 status0;
-       u8 bc_lvl;
-       enum typec_cc_status cc_status;
-
-       mutex_lock(&chip->lock);
-       if (!chip->intr_bc_lvl) {
-               fusb302_log(chip, "BC_LVL interrupt is turned off, abort");
-               goto done;
-       }
-       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
-       if (ret < 0)
-               goto done;
-       fusb302_log(chip, "BC_LVL handler, status0=0x%02x", status0);
-       if (status0 & FUSB_REG_STATUS0_ACTIVITY) {
-               fusb302_log(chip, "CC activities detected, delay handling");
-               mod_delayed_work(chip->wq, &chip->bc_lvl_handler,
-                                msecs_to_jiffies(T_BC_LVL_DEBOUNCE_DELAY_MS));
-               goto done;
-       }
-       bc_lvl = status0 & FUSB_REG_STATUS0_BC_LVL_MASK;
-       cc_status = fusb302_bc_lvl_to_cc(bc_lvl);
-       if (chip->cc_polarity == TYPEC_POLARITY_CC1) {
-               if (chip->cc1 != cc_status) {
-                       fusb302_log(chip, "cc1: %s -> %s",
-                                   typec_cc_status_name[chip->cc1],
-                                   typec_cc_status_name[cc_status]);
-                       chip->cc1 = cc_status;
-                       tcpm_cc_change(chip->tcpm_port);
-               }
-       } else {
-               if (chip->cc2 != cc_status) {
-                       fusb302_log(chip, "cc2: %s -> %s",
-                                   typec_cc_status_name[chip->cc2],
-                                   typec_cc_status_name[cc_status]);
-                       chip->cc2 = cc_status;
-                       tcpm_cc_change(chip->tcpm_port);
-               }
-       }
-
-done:
-       mutex_unlock(&chip->lock);
-}
-
-#define PDO_FIXED_FLAGS \
-       (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP | PDO_FIXED_USB_COMM)
-
-static const u32 src_pdo[] = {
-       PDO_FIXED(5000, 400, PDO_FIXED_FLAGS),
-};
-
-static const struct tcpc_config fusb302_tcpc_config = {
-       .src_pdo = src_pdo,
-       .nr_src_pdo = ARRAY_SIZE(src_pdo),
-       .operating_snk_mw = 2500,
-       .type = TYPEC_PORT_DRP,
-       .data = TYPEC_PORT_DRD,
-       .default_role = TYPEC_SINK,
-       .alt_modes = NULL,
-};
-
-static void init_tcpc_dev(struct tcpc_dev *fusb302_tcpc_dev)
-{
-       fusb302_tcpc_dev->init = tcpm_init;
-       fusb302_tcpc_dev->get_vbus = tcpm_get_vbus;
-       fusb302_tcpc_dev->get_current_limit = tcpm_get_current_limit;
-       fusb302_tcpc_dev->set_cc = tcpm_set_cc;
-       fusb302_tcpc_dev->get_cc = tcpm_get_cc;
-       fusb302_tcpc_dev->set_polarity = tcpm_set_polarity;
-       fusb302_tcpc_dev->set_vconn = tcpm_set_vconn;
-       fusb302_tcpc_dev->set_vbus = tcpm_set_vbus;
-       fusb302_tcpc_dev->set_pd_rx = tcpm_set_pd_rx;
-       fusb302_tcpc_dev->set_roles = tcpm_set_roles;
-       fusb302_tcpc_dev->start_drp_toggling = tcpm_start_drp_toggling;
-       fusb302_tcpc_dev->pd_transmit = tcpm_pd_transmit;
-}
-
-static const char * const cc_polarity_name[] = {
-       [TYPEC_POLARITY_CC1]    = "Polarity_CC1",
-       [TYPEC_POLARITY_CC2]    = "Polarity_CC2",
-};
-
-static int fusb302_set_cc_polarity(struct fusb302_chip *chip,
-                                  enum typec_cc_polarity cc_polarity)
-{
-       int ret = 0;
-       u8 switches0_mask = FUSB_REG_SWITCHES0_CC1_PU_EN |
-                           FUSB_REG_SWITCHES0_CC2_PU_EN |
-                           FUSB_REG_SWITCHES0_VCONN_CC1 |
-                           FUSB_REG_SWITCHES0_VCONN_CC2 |
-                           FUSB_REG_SWITCHES0_MEAS_CC1 |
-                           FUSB_REG_SWITCHES0_MEAS_CC2;
-       u8 switches0_data = 0x00;
-       u8 switches1_mask = FUSB_REG_SWITCHES1_TXCC1_EN |
-                           FUSB_REG_SWITCHES1_TXCC2_EN;
-       u8 switches1_data = 0x00;
-
-       if (cc_polarity == TYPEC_POLARITY_CC1) {
-               switches0_data = FUSB_REG_SWITCHES0_MEAS_CC1;
-               if (chip->vconn_on)
-                       switches0_data |= FUSB_REG_SWITCHES0_VCONN_CC2;
-               if (chip->pull_up)
-                       switches0_data |= FUSB_REG_SWITCHES0_CC1_PU_EN;
-               switches1_data = FUSB_REG_SWITCHES1_TXCC1_EN;
-       } else {
-               switches0_data = FUSB_REG_SWITCHES0_MEAS_CC2;
-               if (chip->vconn_on)
-                       switches0_data |= FUSB_REG_SWITCHES0_VCONN_CC1;
-               if (chip->pull_up)
-                       switches0_data |= FUSB_REG_SWITCHES0_CC2_PU_EN;
-               switches1_data = FUSB_REG_SWITCHES1_TXCC2_EN;
-       }
-       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0,
-                                    switches0_mask, switches0_data);
-       if (ret < 0)
-               return ret;
-       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES1,
-                                    switches1_mask, switches1_data);
-       if (ret < 0)
-               return ret;
-       chip->cc_polarity = cc_polarity;
-
-       return ret;
-}
-
-static int fusb302_handle_togdone_snk(struct fusb302_chip *chip,
-                                     u8 togdone_result)
-{
-       int ret = 0;
-       u8 status0;
-       u8 bc_lvl;
-       enum typec_cc_polarity cc_polarity;
-       enum typec_cc_status cc_status_active, cc1, cc2;
-
-       /* set pull_up, pull_down */
-       ret = fusb302_set_cc_pull(chip, false, true);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot set cc to pull down, ret=%d", ret);
-               return ret;
-       }
-       /* set polarity */
-       cc_polarity = (togdone_result == FUSB_REG_STATUS1A_TOGSS_SNK1) ?
-                     TYPEC_POLARITY_CC1 : TYPEC_POLARITY_CC2;
-       ret = fusb302_set_cc_polarity(chip, cc_polarity);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot set cc polarity %s, ret=%d",
-                           cc_polarity_name[cc_polarity], ret);
-               return ret;
-       }
-       /* fusb302_set_cc_polarity() has set the correct measure block */
-       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
-       if (ret < 0)
-               return ret;
-       bc_lvl = status0 & FUSB_REG_STATUS0_BC_LVL_MASK;
-       cc_status_active = fusb302_bc_lvl_to_cc(bc_lvl);
-       /* restart toggling if the cc status on the active line is OPEN */
-       if (cc_status_active == TYPEC_CC_OPEN) {
-               fusb302_log(chip, "restart toggling as CC_OPEN detected");
-               ret = fusb302_set_toggling(chip, chip->toggling_mode);
-               return ret;
-       }
-       /* update tcpm with the new cc value */
-       cc1 = (cc_polarity == TYPEC_POLARITY_CC1) ?
-             cc_status_active : TYPEC_CC_OPEN;
-       cc2 = (cc_polarity == TYPEC_POLARITY_CC2) ?
-             cc_status_active : TYPEC_CC_OPEN;
-       if ((chip->cc1 != cc1) || (chip->cc2 != cc2)) {
-               chip->cc1 = cc1;
-               chip->cc2 = cc2;
-               tcpm_cc_change(chip->tcpm_port);
-       }
-       /* turn off toggling */
-       ret = fusb302_set_toggling(chip, TOGGLINE_MODE_OFF);
-       if (ret < 0) {
-               fusb302_log(chip,
-                           "cannot set toggling mode off, ret=%d", ret);
-               return ret;
-       }
-       /* unmask bc_lvl interrupt */
-       ret = fusb302_i2c_clear_bits(chip, FUSB_REG_MASK, FUSB_REG_MASK_BC_LVL);
-       if (ret < 0) {
-               fusb302_log(chip,
-                           "cannot unmask bc_lcl interrupt, ret=%d", ret);
-               return ret;
-       }
-       chip->intr_bc_lvl = true;
-       fusb302_log(chip, "detected cc1=%s, cc2=%s",
-                   typec_cc_status_name[cc1],
-                   typec_cc_status_name[cc2]);
-
-       return ret;
-}
-
-static int fusb302_handle_togdone_src(struct fusb302_chip *chip,
-                                     u8 togdone_result)
-{
-       /*
-        * - set polarity (measure cc, vconn, tx)
-        * - set pull_up, pull_down
-        * - set cc1, cc2, and update to tcpm_port
-        * - set I_COMP interrupt on
-        */
-       int ret = 0;
-       u8 status0;
-       u8 ra_mda = ra_mda_value[chip->src_current_status];
-       u8 rd_mda = rd_mda_value[chip->src_current_status];
-       bool ra_comp, rd_comp;
-       enum typec_cc_polarity cc_polarity;
-       enum typec_cc_status cc_status_active, cc1, cc2;
-
-       /* set pull_up, pull_down */
-       ret = fusb302_set_cc_pull(chip, true, false);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot set cc to pull up, ret=%d", ret);
-               return ret;
-       }
-       /* set polarity */
-       cc_polarity = (togdone_result == FUSB_REG_STATUS1A_TOGSS_SRC1) ?
-                     TYPEC_POLARITY_CC1 : TYPEC_POLARITY_CC2;
-       ret = fusb302_set_cc_polarity(chip, cc_polarity);
-       if (ret < 0) {
-               fusb302_log(chip, "cannot set cc polarity %s, ret=%d",
-                           cc_polarity_name[cc_polarity], ret);
-               return ret;
-       }
-       /* fusb302_set_cc_polarity() has set the correct measure block */
-       ret = fusb302_i2c_write(chip, FUSB_REG_MEASURE, rd_mda);
-       if (ret < 0)
-               return ret;
-       usleep_range(50, 100);
-       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
-       if (ret < 0)
-               return ret;
-       rd_comp = !!(status0 & FUSB_REG_STATUS0_COMP);
-       if (!rd_comp) {
-               ret = fusb302_i2c_write(chip, FUSB_REG_MEASURE, ra_mda);
-               if (ret < 0)
-                       return ret;
-               usleep_range(50, 100);
-               ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
-               if (ret < 0)
-                       return ret;
-               ra_comp = !!(status0 & FUSB_REG_STATUS0_COMP);
-       }
-       if (rd_comp)
-               cc_status_active = TYPEC_CC_OPEN;
-       else if (ra_comp)
-               cc_status_active = TYPEC_CC_RD;
-       else
-               /* Ra is not supported, report as Open */
-               cc_status_active = TYPEC_CC_OPEN;
-       /* restart toggling if the cc status on the active line is OPEN */
-       if (cc_status_active == TYPEC_CC_OPEN) {
-               fusb302_log(chip, "restart toggling as CC_OPEN detected");
-               ret = fusb302_set_toggling(chip, chip->toggling_mode);
-               return ret;
-       }
-       /* update tcpm with the new cc value */
-       cc1 = (cc_polarity == TYPEC_POLARITY_CC1) ?
-             cc_status_active : TYPEC_CC_OPEN;
-       cc2 = (cc_polarity == TYPEC_POLARITY_CC2) ?
-             cc_status_active : TYPEC_CC_OPEN;
-       if ((chip->cc1 != cc1) || (chip->cc2 != cc2)) {
-               chip->cc1 = cc1;
-               chip->cc2 = cc2;
-               tcpm_cc_change(chip->tcpm_port);
-       }
-       /* turn off toggling */
-       ret = fusb302_set_toggling(chip, TOGGLINE_MODE_OFF);
-       if (ret < 0) {
-               fusb302_log(chip,
-                           "cannot set toggling mode off, ret=%d", ret);
-               return ret;
-       }
-       /* set MDAC to Rd threshold, and unmask I_COMP for unplug detection */
-       ret = fusb302_i2c_write(chip, FUSB_REG_MEASURE, rd_mda);
-       if (ret < 0)
-               return ret;
-       /* unmask comp_chng interrupt */
-       ret = fusb302_i2c_clear_bits(chip, FUSB_REG_MASK,
-                                    FUSB_REG_MASK_COMP_CHNG);
-       if (ret < 0) {
-               fusb302_log(chip,
-                           "cannot unmask bc_lcl interrupt, ret=%d", ret);
-               return ret;
-       }
-       chip->intr_comp_chng = true;
-       fusb302_log(chip, "detected cc1=%s, cc2=%s",
-                   typec_cc_status_name[cc1],
-                   typec_cc_status_name[cc2]);
-
-       return ret;
-}
-
-static int fusb302_handle_togdone(struct fusb302_chip *chip)
-{
-       int ret = 0;
-       u8 status1a;
-       u8 togdone_result;
-
-       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS1A, &status1a);
-       if (ret < 0)
-               return ret;
-       togdone_result = (status1a >> FUSB_REG_STATUS1A_TOGSS_POS) &
-                        FUSB_REG_STATUS1A_TOGSS_MASK;
-       switch (togdone_result) {
-       case FUSB_REG_STATUS1A_TOGSS_SNK1:
-       case FUSB_REG_STATUS1A_TOGSS_SNK2:
-               return fusb302_handle_togdone_snk(chip, togdone_result);
-       case FUSB_REG_STATUS1A_TOGSS_SRC1:
-       case FUSB_REG_STATUS1A_TOGSS_SRC2:
-               return fusb302_handle_togdone_src(chip, togdone_result);
-       case FUSB_REG_STATUS1A_TOGSS_AA:
-               /* doesn't support */
-               fusb302_log(chip, "AudioAccessory not supported");
-               fusb302_set_toggling(chip, chip->toggling_mode);
-               break;
-       default:
-               fusb302_log(chip, "TOGDONE with an invalid state: %d",
-                           togdone_result);
-               fusb302_set_toggling(chip, chip->toggling_mode);
-               break;
-       }
-       return ret;
-}
-
-static int fusb302_pd_reset(struct fusb302_chip *chip)
-{
-       return fusb302_i2c_set_bits(chip, FUSB_REG_RESET,
-                                   FUSB_REG_RESET_PD_RESET);
-}
-
-static int fusb302_pd_read_message(struct fusb302_chip *chip,
-                                  struct pd_message *msg)
-{
-       int ret = 0;
-       u8 token;
-       u8 crc[4];
-       int len;
-
-       /* first SOP token */
-       ret = fusb302_i2c_read(chip, FUSB_REG_FIFOS, &token);
-       if (ret < 0)
-               return ret;
-       ret = fusb302_i2c_block_read(chip, FUSB_REG_FIFOS, 2,
-                                    (u8 *)&msg->header);
-       if (ret < 0)
-               return ret;
-       len = pd_header_cnt_le(msg->header) * 4;
-       /* add 4 to length to include the CRC */
-       if (len > PD_MAX_PAYLOAD * 4) {
-               fusb302_log(chip, "PD message too long %d", len);
-               return -EINVAL;
-       }
-       if (len > 0) {
-               ret = fusb302_i2c_block_read(chip, FUSB_REG_FIFOS, len,
-                                            (u8 *)msg->payload);
-               if (ret < 0)
-                       return ret;
-       }
-       /* another 4 bytes to read CRC out */
-       ret = fusb302_i2c_block_read(chip, FUSB_REG_FIFOS, 4, crc);
-       if (ret < 0)
-               return ret;
-       fusb302_log(chip, "PD message header: %x", msg->header);
-       fusb302_log(chip, "PD message len: %d", len);
-
-       /*
-        * Check if we've read off a GoodCRC message. If so then indicate to
-        * TCPM that the previous transmission has completed. Otherwise we pass
-        * the received message over to TCPM for processing.
-        *
-        * We make this check here instead of basing the reporting decision on
-        * the IRQ event type, as it's possible for the chip to report the
-        * TX_SUCCESS and GCRCSENT events out of order on occasion, so we need
-        * to check the message type to ensure correct reporting to TCPM.
-        */
-       if ((!len) && (pd_header_type_le(msg->header) == PD_CTRL_GOOD_CRC))
-               tcpm_pd_transmit_complete(chip->tcpm_port, TCPC_TX_SUCCESS);
-       else
-               tcpm_pd_receive(chip->tcpm_port, msg);
-
-       return ret;
-}
-
-static irqreturn_t fusb302_irq_intn(int irq, void *dev_id)
-{
-       struct fusb302_chip *chip = dev_id;
-       int ret = 0;
-       u8 interrupt;
-       u8 interrupta;
-       u8 interruptb;
-       u8 status0;
-       bool vbus_present;
-       bool comp_result;
-       bool intr_togdone;
-       bool intr_bc_lvl;
-       bool intr_comp_chng;
-       struct pd_message pd_msg;
-
-       mutex_lock(&chip->lock);
-       /* grab a snapshot of intr flags */
-       intr_togdone = chip->intr_togdone;
-       intr_bc_lvl = chip->intr_bc_lvl;
-       intr_comp_chng = chip->intr_comp_chng;
-
-       ret = fusb302_i2c_read(chip, FUSB_REG_INTERRUPT, &interrupt);
-       if (ret < 0)
-               goto done;
-       ret = fusb302_i2c_read(chip, FUSB_REG_INTERRUPTA, &interrupta);
-       if (ret < 0)
-               goto done;
-       ret = fusb302_i2c_read(chip, FUSB_REG_INTERRUPTB, &interruptb);
-       if (ret < 0)
-               goto done;
-       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
-       if (ret < 0)
-               goto done;
-       fusb302_log(chip,
-                   "IRQ: 0x%02x, a: 0x%02x, b: 0x%02x, status0: 0x%02x",
-                   interrupt, interrupta, interruptb, status0);
-
-       if (interrupt & FUSB_REG_INTERRUPT_VBUSOK) {
-               vbus_present = !!(status0 & FUSB_REG_STATUS0_VBUSOK);
-               fusb302_log(chip, "IRQ: VBUS_OK, vbus=%s",
-                           vbus_present ? "On" : "Off");
-               if (vbus_present != chip->vbus_present) {
-                       chip->vbus_present = vbus_present;
-                       tcpm_vbus_change(chip->tcpm_port);
-               }
-       }
-
-       if ((interrupta & FUSB_REG_INTERRUPTA_TOGDONE) && intr_togdone) {
-               fusb302_log(chip, "IRQ: TOGDONE");
-               ret = fusb302_handle_togdone(chip);
-               if (ret < 0) {
-                       fusb302_log(chip,
-                                   "handle togdone error, ret=%d", ret);
-                       goto done;
-               }
-       }
-
-       if ((interrupt & FUSB_REG_INTERRUPT_BC_LVL) && intr_bc_lvl) {
-               fusb302_log(chip, "IRQ: BC_LVL, handler pending");
-               /*
-                * as BC_LVL interrupt can be affected by PD activity,
-                * apply delay to for the handler to wait for the PD
-                * signaling to finish.
-                */
-               mod_delayed_work(chip->wq, &chip->bc_lvl_handler,
-                                msecs_to_jiffies(T_BC_LVL_DEBOUNCE_DELAY_MS));
-       }
-
-       if ((interrupt & FUSB_REG_INTERRUPT_COMP_CHNG) && intr_comp_chng) {
-               comp_result = !!(status0 & FUSB_REG_STATUS0_COMP);
-               fusb302_log(chip, "IRQ: COMP_CHNG, comp=%s",
-                           comp_result ? "true" : "false");
-               if (comp_result) {
-                       /* cc level > Rd_threashold, detach */
-                       if (chip->cc_polarity == TYPEC_POLARITY_CC1)
-                               chip->cc1 = TYPEC_CC_OPEN;
-                       else
-                               chip->cc2 = TYPEC_CC_OPEN;
-                       tcpm_cc_change(chip->tcpm_port);
-               }
-       }
-
-       if (interrupt & FUSB_REG_INTERRUPT_COLLISION) {
-               fusb302_log(chip, "IRQ: PD collision");
-               tcpm_pd_transmit_complete(chip->tcpm_port, TCPC_TX_FAILED);
-       }
-
-       if (interrupta & FUSB_REG_INTERRUPTA_RETRYFAIL) {
-               fusb302_log(chip, "IRQ: PD retry failed");
-               tcpm_pd_transmit_complete(chip->tcpm_port, TCPC_TX_FAILED);
-       }
-
-       if (interrupta & FUSB_REG_INTERRUPTA_HARDSENT) {
-               fusb302_log(chip, "IRQ: PD hardreset sent");
-               ret = fusb302_pd_reset(chip);
-               if (ret < 0) {
-                       fusb302_log(chip, "cannot PD reset, ret=%d", ret);
-                       goto done;
-               }
-               tcpm_pd_transmit_complete(chip->tcpm_port, TCPC_TX_SUCCESS);
-       }
-
-       if (interrupta & FUSB_REG_INTERRUPTA_TX_SUCCESS) {
-               fusb302_log(chip, "IRQ: PD tx success");
-               ret = fusb302_pd_read_message(chip, &pd_msg);
-               if (ret < 0) {
-                       fusb302_log(chip,
-                                   "cannot read in PD message, ret=%d", ret);
-                       goto done;
-               }
-       }
-
-       if (interrupta & FUSB_REG_INTERRUPTA_HARDRESET) {
-               fusb302_log(chip, "IRQ: PD received hardreset");
-               ret = fusb302_pd_reset(chip);
-               if (ret < 0) {
-                       fusb302_log(chip, "cannot PD reset, ret=%d", ret);
-                       goto done;
-               }
-               tcpm_pd_hard_reset(chip->tcpm_port);
-       }
-
-       if (interruptb & FUSB_REG_INTERRUPTB_GCRCSENT) {
-               fusb302_log(chip, "IRQ: PD sent good CRC");
-               ret = fusb302_pd_read_message(chip, &pd_msg);
-               if (ret < 0) {
-                       fusb302_log(chip,
-                                   "cannot read in PD message, ret=%d", ret);
-                       goto done;
-               }
-       }
-done:
-       mutex_unlock(&chip->lock);
-
-       return IRQ_HANDLED;
-}
-
-static int init_gpio(struct fusb302_chip *chip)
-{
-       struct device_node *node;
-       int ret = 0;
-
-       node = chip->dev->of_node;
-       chip->gpio_int_n = of_get_named_gpio(node, "fcs,int_n", 0);
-       if (!gpio_is_valid(chip->gpio_int_n)) {
-               ret = chip->gpio_int_n;
-               dev_err(chip->dev, "cannot get named GPIO Int_N, ret=%d", ret);
-               return ret;
-       }
-       ret = devm_gpio_request(chip->dev, chip->gpio_int_n, "fcs,int_n");
-       if (ret < 0) {
-               dev_err(chip->dev, "cannot request GPIO Int_N, ret=%d", ret);
-               return ret;
-       }
-       ret = gpio_direction_input(chip->gpio_int_n);
-       if (ret < 0) {
-               dev_err(chip->dev,
-                       "cannot set GPIO Int_N to input, ret=%d", ret);
-               return ret;
-       }
-       ret = gpio_to_irq(chip->gpio_int_n);
-       if (ret < 0) {
-               dev_err(chip->dev,
-                       "cannot request IRQ for GPIO Int_N, ret=%d", ret);
-               return ret;
-       }
-       chip->gpio_int_n_irq = ret;
-       return 0;
-}
-
-static int fusb302_composite_snk_pdo_array(struct fusb302_chip *chip)
-{
-       struct device *dev = chip->dev;
-       u32 max_uv, max_ua;
-
-       chip->snk_pdo[0] = PDO_FIXED(5000, 400, PDO_FIXED_FLAGS);
-
-       /*
-        * As max_snk_ma/mv/mw is not needed for tcpc_config,
-        * those settings should be passed in via sink PDO, so
-        * "fcs, max-sink-*" properties will be deprecated, to
-        * perserve compatibility with existing users of them,
-        * we read those properties to convert them to be a var
-        * PDO.
-        */
-       if (device_property_read_u32(dev, "fcs,max-sink-microvolt", &max_uv) ||
-               device_property_read_u32(dev, "fcs,max-sink-microamp", &max_ua))
-               return 1;
-
-       chip->snk_pdo[1] = PDO_VAR(5000, max_uv / 1000, max_ua / 1000);
-       return 2;
-}
-
-static int fusb302_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
-{
-       struct fusb302_chip *chip;
-       struct i2c_adapter *adapter;
-       struct device *dev = &client->dev;
-       const char *name;
-       int ret = 0;
-       u32 v;
-
-       adapter = to_i2c_adapter(client->dev.parent);
-       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
-               dev_err(&client->dev,
-                       "I2C/SMBus block functionality not supported!\n");
-               return -ENODEV;
-       }
-       chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
-       if (!chip)
-               return -ENOMEM;
-
-       chip->i2c_client = client;
-       chip->dev = &client->dev;
-       chip->tcpc_config = fusb302_tcpc_config;
-       chip->tcpc_dev.config = &chip->tcpc_config;
-       mutex_init(&chip->lock);
-
-       chip->tcpc_dev.fwnode =
-               device_get_named_child_node(dev, "connector");
-
-       if (!device_property_read_u32(dev, "fcs,operating-sink-microwatt", &v))
-               chip->tcpc_config.operating_snk_mw = v / 1000;
-
-       /* Composite sink PDO */
-       chip->tcpc_config.nr_snk_pdo = fusb302_composite_snk_pdo_array(chip);
-       chip->tcpc_config.snk_pdo = chip->snk_pdo;
-
-       /*
-        * Devicetree platforms should get extcon via phandle (not yet
-        * supported). On ACPI platforms, we get the name from a device prop.
-        * This device prop is for kernel internal use only and is expected
-        * to be set by the platform code which also registers the i2c client
-        * for the fusb302.
-        */
-       if (device_property_read_string(dev, "fcs,extcon-name", &name) == 0) {
-               chip->extcon = extcon_get_extcon_dev(name);
-               if (!chip->extcon)
-                       return -EPROBE_DEFER;
-       }
-
-       chip->vbus = devm_regulator_get(chip->dev, "vbus");
-       if (IS_ERR(chip->vbus))
-               return PTR_ERR(chip->vbus);
-
-       chip->wq = create_singlethread_workqueue(dev_name(chip->dev));
-       if (!chip->wq)
-               return -ENOMEM;
-
-       INIT_DELAYED_WORK(&chip->bc_lvl_handler, fusb302_bc_lvl_handler_work);
-       init_tcpc_dev(&chip->tcpc_dev);
-
-       if (client->irq) {
-               chip->gpio_int_n_irq = client->irq;
-       } else {
-               ret = init_gpio(chip);
-               if (ret < 0)
-                       goto destroy_workqueue;
-       }
-
-       chip->tcpm_port = tcpm_register_port(&client->dev, &chip->tcpc_dev);
-       if (IS_ERR(chip->tcpm_port)) {
-               ret = PTR_ERR(chip->tcpm_port);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "cannot register tcpm port, ret=%d", ret);
-               goto destroy_workqueue;
-       }
-
-       ret = devm_request_threaded_irq(chip->dev, chip->gpio_int_n_irq,
-                                       NULL, fusb302_irq_intn,
-                                       IRQF_ONESHOT | IRQF_TRIGGER_LOW,
-                                       "fsc_interrupt_int_n", chip);
-       if (ret < 0) {
-               dev_err(dev, "cannot request IRQ for GPIO Int_N, ret=%d", ret);
-               goto tcpm_unregister_port;
-       }
-       enable_irq_wake(chip->gpio_int_n_irq);
-       fusb302_debugfs_init(chip);
-       i2c_set_clientdata(client, chip);
-
-       return ret;
-
-tcpm_unregister_port:
-       tcpm_unregister_port(chip->tcpm_port);
-destroy_workqueue:
-       destroy_workqueue(chip->wq);
-
-       return ret;
-}
-
-static int fusb302_remove(struct i2c_client *client)
-{
-       struct fusb302_chip *chip = i2c_get_clientdata(client);
-
-       tcpm_unregister_port(chip->tcpm_port);
-       destroy_workqueue(chip->wq);
-       fusb302_debugfs_exit(chip);
-
-       return 0;
-}
-
-static int fusb302_pm_suspend(struct device *dev)
-{
-       struct fusb302_chip *chip = dev->driver_data;
-
-       if (atomic_read(&chip->i2c_busy))
-               return -EBUSY;
-       atomic_set(&chip->pm_suspend, 1);
-
-       return 0;
-}
-
-static int fusb302_pm_resume(struct device *dev)
-{
-       struct fusb302_chip *chip = dev->driver_data;
-
-       atomic_set(&chip->pm_suspend, 0);
-
-       return 0;
-}
-
-static const struct of_device_id fusb302_dt_match[] = {
-       {.compatible = "fcs,fusb302"},
-       {},
-};
-MODULE_DEVICE_TABLE(of, fusb302_dt_match);
-
-static const struct i2c_device_id fusb302_i2c_device_id[] = {
-       {"typec_fusb302", 0},
-       {},
-};
-MODULE_DEVICE_TABLE(i2c, fusb302_i2c_device_id);
-
-static const struct dev_pm_ops fusb302_pm_ops = {
-       .suspend = fusb302_pm_suspend,
-       .resume = fusb302_pm_resume,
-};
-
-static struct i2c_driver fusb302_driver = {
-       .driver = {
-                  .name = "typec_fusb302",
-                  .pm = &fusb302_pm_ops,
-                  .of_match_table = of_match_ptr(fusb302_dt_match),
-                  },
-       .probe = fusb302_probe,
-       .remove = fusb302_remove,
-       .id_table = fusb302_i2c_device_id,
-};
-module_i2c_driver(fusb302_driver);
-
-MODULE_AUTHOR("Yueyao Zhu <yueyao.zhu@gmail.com>");
-MODULE_DESCRIPTION("Fairchild FUSB302 Type-C Chip Driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/usb/typec/fusb302/fusb302_reg.h b/drivers/usb/typec/fusb302/fusb302_reg.h
deleted file mode 100644 (file)
index 00b39d3..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2016-2017 Google, Inc
- *
- * Fairchild FUSB302 Type-C Chip Driver
- */
-
-#ifndef FUSB302_REG_H
-#define FUSB302_REG_H
-
-#define FUSB_REG_DEVICE_ID                     0x01
-#define FUSB_REG_SWITCHES0                     0x02
-#define FUSB_REG_SWITCHES0_CC2_PU_EN           BIT(7)
-#define FUSB_REG_SWITCHES0_CC1_PU_EN           BIT(6)
-#define FUSB_REG_SWITCHES0_VCONN_CC2           BIT(5)
-#define FUSB_REG_SWITCHES0_VCONN_CC1           BIT(4)
-#define FUSB_REG_SWITCHES0_MEAS_CC2            BIT(3)
-#define FUSB_REG_SWITCHES0_MEAS_CC1            BIT(2)
-#define FUSB_REG_SWITCHES0_CC2_PD_EN           BIT(1)
-#define FUSB_REG_SWITCHES0_CC1_PD_EN           BIT(0)
-#define FUSB_REG_SWITCHES1                     0x03
-#define FUSB_REG_SWITCHES1_POWERROLE           BIT(7)
-#define FUSB_REG_SWITCHES1_SPECREV1            BIT(6)
-#define FUSB_REG_SWITCHES1_SPECREV0            BIT(5)
-#define FUSB_REG_SWITCHES1_DATAROLE            BIT(4)
-#define FUSB_REG_SWITCHES1_AUTO_GCRC           BIT(2)
-#define FUSB_REG_SWITCHES1_TXCC2_EN            BIT(1)
-#define FUSB_REG_SWITCHES1_TXCC1_EN            BIT(0)
-#define FUSB_REG_MEASURE                       0x04
-#define FUSB_REG_MEASURE_MDAC5                 BIT(7)
-#define FUSB_REG_MEASURE_MDAC4                 BIT(6)
-#define FUSB_REG_MEASURE_MDAC3                 BIT(5)
-#define FUSB_REG_MEASURE_MDAC2                 BIT(4)
-#define FUSB_REG_MEASURE_MDAC1                 BIT(3)
-#define FUSB_REG_MEASURE_MDAC0                 BIT(2)
-#define FUSB_REG_MEASURE_VBUS                  BIT(1)
-#define FUSB_REG_MEASURE_XXXX5                 BIT(0)
-#define FUSB_REG_CONTROL0                      0x06
-#define FUSB_REG_CONTROL0_TX_FLUSH             BIT(6)
-#define FUSB_REG_CONTROL0_INT_MASK             BIT(5)
-#define FUSB_REG_CONTROL0_HOST_CUR_MASK                (0xC)
-#define FUSB_REG_CONTROL0_HOST_CUR_HIGH                (0xC)
-#define FUSB_REG_CONTROL0_HOST_CUR_MED         (0x8)
-#define FUSB_REG_CONTROL0_HOST_CUR_DEF         (0x4)
-#define FUSB_REG_CONTROL0_TX_START             BIT(0)
-#define FUSB_REG_CONTROL1                      0x07
-#define FUSB_REG_CONTROL1_ENSOP2DB             BIT(6)
-#define FUSB_REG_CONTROL1_ENSOP1DB             BIT(5)
-#define FUSB_REG_CONTROL1_BIST_MODE2           BIT(4)
-#define FUSB_REG_CONTROL1_RX_FLUSH             BIT(2)
-#define FUSB_REG_CONTROL1_ENSOP2               BIT(1)
-#define FUSB_REG_CONTROL1_ENSOP1               BIT(0)
-#define FUSB_REG_CONTROL2                      0x08
-#define FUSB_REG_CONTROL2_MODE                 BIT(1)
-#define FUSB_REG_CONTROL2_MODE_MASK            (0x6)
-#define FUSB_REG_CONTROL2_MODE_DFP             (0x6)
-#define FUSB_REG_CONTROL2_MODE_UFP             (0x4)
-#define FUSB_REG_CONTROL2_MODE_DRP             (0x2)
-#define FUSB_REG_CONTROL2_MODE_NONE            (0x0)
-#define FUSB_REG_CONTROL2_TOGGLE               BIT(0)
-#define FUSB_REG_CONTROL3                      0x09
-#define FUSB_REG_CONTROL3_SEND_HARDRESET       BIT(6)
-#define FUSB_REG_CONTROL3_BIST_TMODE           BIT(5)  /* 302B Only */
-#define FUSB_REG_CONTROL3_AUTO_HARDRESET       BIT(4)
-#define FUSB_REG_CONTROL3_AUTO_SOFTRESET       BIT(3)
-#define FUSB_REG_CONTROL3_N_RETRIES            BIT(1)
-#define FUSB_REG_CONTROL3_N_RETRIES_MASK       (0x6)
-#define FUSB_REG_CONTROL3_N_RETRIES_3          (0x6)
-#define FUSB_REG_CONTROL3_N_RETRIES_2          (0x4)
-#define FUSB_REG_CONTROL3_N_RETRIES_1          (0x2)
-#define FUSB_REG_CONTROL3_AUTO_RETRY           BIT(0)
-#define FUSB_REG_MASK                          0x0A
-#define FUSB_REG_MASK_VBUSOK                   BIT(7)
-#define FUSB_REG_MASK_ACTIVITY                 BIT(6)
-#define FUSB_REG_MASK_COMP_CHNG                        BIT(5)
-#define FUSB_REG_MASK_CRC_CHK                  BIT(4)
-#define FUSB_REG_MASK_ALERT                    BIT(3)
-#define FUSB_REG_MASK_WAKE                     BIT(2)
-#define FUSB_REG_MASK_COLLISION                        BIT(1)
-#define FUSB_REG_MASK_BC_LVL                   BIT(0)
-#define FUSB_REG_POWER                         0x0B
-#define FUSB_REG_POWER_PWR                     BIT(0)
-#define FUSB_REG_POWER_PWR_LOW                 0x1
-#define FUSB_REG_POWER_PWR_MEDIUM              0x3
-#define FUSB_REG_POWER_PWR_HIGH                        0x7
-#define FUSB_REG_POWER_PWR_ALL                 0xF
-#define FUSB_REG_RESET                         0x0C
-#define FUSB_REG_RESET_PD_RESET                        BIT(1)
-#define FUSB_REG_RESET_SW_RESET                        BIT(0)
-#define FUSB_REG_MASKA                         0x0E
-#define FUSB_REG_MASKA_OCP_TEMP                        BIT(7)
-#define FUSB_REG_MASKA_TOGDONE                 BIT(6)
-#define FUSB_REG_MASKA_SOFTFAIL                        BIT(5)
-#define FUSB_REG_MASKA_RETRYFAIL               BIT(4)
-#define FUSB_REG_MASKA_HARDSENT                        BIT(3)
-#define FUSB_REG_MASKA_TX_SUCCESS              BIT(2)
-#define FUSB_REG_MASKA_SOFTRESET               BIT(1)
-#define FUSB_REG_MASKA_HARDRESET               BIT(0)
-#define FUSB_REG_MASKB                         0x0F
-#define FUSB_REG_MASKB_GCRCSENT                        BIT(0)
-#define FUSB_REG_STATUS0A                      0x3C
-#define FUSB_REG_STATUS0A_SOFTFAIL             BIT(5)
-#define FUSB_REG_STATUS0A_RETRYFAIL            BIT(4)
-#define FUSB_REG_STATUS0A_POWER                        BIT(2)
-#define FUSB_REG_STATUS0A_RX_SOFT_RESET                BIT(1)
-#define FUSB_REG_STATUS0A_RX_HARD_RESET                BIT(0)
-#define FUSB_REG_STATUS1A                      0x3D
-#define FUSB_REG_STATUS1A_TOGSS                        BIT(3)
-#define FUSB_REG_STATUS1A_TOGSS_RUNNING                0x0
-#define FUSB_REG_STATUS1A_TOGSS_SRC1           0x1
-#define FUSB_REG_STATUS1A_TOGSS_SRC2           0x2
-#define FUSB_REG_STATUS1A_TOGSS_SNK1           0x5
-#define FUSB_REG_STATUS1A_TOGSS_SNK2           0x6
-#define FUSB_REG_STATUS1A_TOGSS_AA             0x7
-#define FUSB_REG_STATUS1A_TOGSS_POS            (3)
-#define FUSB_REG_STATUS1A_TOGSS_MASK           (0x7)
-#define FUSB_REG_STATUS1A_RXSOP2DB             BIT(2)
-#define FUSB_REG_STATUS1A_RXSOP1DB             BIT(1)
-#define FUSB_REG_STATUS1A_RXSOP                        BIT(0)
-#define FUSB_REG_INTERRUPTA                    0x3E
-#define FUSB_REG_INTERRUPTA_OCP_TEMP           BIT(7)
-#define FUSB_REG_INTERRUPTA_TOGDONE            BIT(6)
-#define FUSB_REG_INTERRUPTA_SOFTFAIL           BIT(5)
-#define FUSB_REG_INTERRUPTA_RETRYFAIL          BIT(4)
-#define FUSB_REG_INTERRUPTA_HARDSENT           BIT(3)
-#define FUSB_REG_INTERRUPTA_TX_SUCCESS         BIT(2)
-#define FUSB_REG_INTERRUPTA_SOFTRESET          BIT(1)
-#define FUSB_REG_INTERRUPTA_HARDRESET          BIT(0)
-#define FUSB_REG_INTERRUPTB                    0x3F
-#define FUSB_REG_INTERRUPTB_GCRCSENT           BIT(0)
-#define FUSB_REG_STATUS0                       0x40
-#define FUSB_REG_STATUS0_VBUSOK                        BIT(7)
-#define FUSB_REG_STATUS0_ACTIVITY              BIT(6)
-#define FUSB_REG_STATUS0_COMP                  BIT(5)
-#define FUSB_REG_STATUS0_CRC_CHK               BIT(4)
-#define FUSB_REG_STATUS0_ALERT                 BIT(3)
-#define FUSB_REG_STATUS0_WAKE                  BIT(2)
-#define FUSB_REG_STATUS0_BC_LVL_MASK           0x03
-#define FUSB_REG_STATUS0_BC_LVL_0_200          0x0
-#define FUSB_REG_STATUS0_BC_LVL_200_600                0x1
-#define FUSB_REG_STATUS0_BC_LVL_600_1230       0x2
-#define FUSB_REG_STATUS0_BC_LVL_1230_MAX       0x3
-#define FUSB_REG_STATUS0_BC_LVL1               BIT(1)
-#define FUSB_REG_STATUS0_BC_LVL0               BIT(0)
-#define FUSB_REG_STATUS1                       0x41
-#define FUSB_REG_STATUS1_RXSOP2                        BIT(7)
-#define FUSB_REG_STATUS1_RXSOP1                        BIT(6)
-#define FUSB_REG_STATUS1_RX_EMPTY              BIT(5)
-#define FUSB_REG_STATUS1_RX_FULL               BIT(4)
-#define FUSB_REG_STATUS1_TX_EMPTY              BIT(3)
-#define FUSB_REG_STATUS1_TX_FULL               BIT(2)
-#define FUSB_REG_INTERRUPT                     0x42
-#define FUSB_REG_INTERRUPT_VBUSOK              BIT(7)
-#define FUSB_REG_INTERRUPT_ACTIVITY            BIT(6)
-#define FUSB_REG_INTERRUPT_COMP_CHNG           BIT(5)
-#define FUSB_REG_INTERRUPT_CRC_CHK             BIT(4)
-#define FUSB_REG_INTERRUPT_ALERT               BIT(3)
-#define FUSB_REG_INTERRUPT_WAKE                        BIT(2)
-#define FUSB_REG_INTERRUPT_COLLISION           BIT(1)
-#define FUSB_REG_INTERRUPT_BC_LVL              BIT(0)
-#define FUSB_REG_FIFOS                         0x43
-
-/* Tokens defined for the FUSB302 TX FIFO */
-enum fusb302_txfifo_tokens {
-       FUSB302_TKN_TXON = 0xA1,
-       FUSB302_TKN_SYNC1 = 0x12,
-       FUSB302_TKN_SYNC2 = 0x13,
-       FUSB302_TKN_SYNC3 = 0x1B,
-       FUSB302_TKN_RST1 = 0x15,
-       FUSB302_TKN_RST2 = 0x16,
-       FUSB302_TKN_PACKSYM = 0x80,
-       FUSB302_TKN_JAMCRC = 0xFF,
-       FUSB302_TKN_EOP = 0x14,
-       FUSB302_TKN_TXOFF = 0xFE,
-};
-
-#endif
diff --git a/drivers/usb/typec/tcpci.c b/drivers/usb/typec/tcpci.c
deleted file mode 100644 (file)
index ac6b418..0000000
+++ /dev/null
@@ -1,612 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2015-2017 Google, Inc
- *
- * USB Type-C Port Controller Interface.
- */
-
-#include <linux/delay.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/i2c.h>
-#include <linux/interrupt.h>
-#include <linux/property.h>
-#include <linux/regmap.h>
-#include <linux/usb/pd.h>
-#include <linux/usb/tcpm.h>
-#include <linux/usb/typec.h>
-
-#include "tcpci.h"
-
-#define PD_RETRY_COUNT 3
-
-struct tcpci {
-       struct device *dev;
-
-       struct tcpm_port *port;
-
-       struct regmap *regmap;
-
-       bool controls_vbus;
-
-       struct tcpc_dev tcpc;
-       struct tcpci_data *data;
-};
-
-struct tcpci_chip {
-       struct tcpci *tcpci;
-       struct tcpci_data data;
-};
-
-static inline struct tcpci *tcpc_to_tcpci(struct tcpc_dev *tcpc)
-{
-       return container_of(tcpc, struct tcpci, tcpc);
-}
-
-static int tcpci_read16(struct tcpci *tcpci, unsigned int reg, u16 *val)
-{
-       return regmap_raw_read(tcpci->regmap, reg, val, sizeof(u16));
-}
-
-static int tcpci_write16(struct tcpci *tcpci, unsigned int reg, u16 val)
-{
-       return regmap_raw_write(tcpci->regmap, reg, &val, sizeof(u16));
-}
-
-static int tcpci_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       unsigned int reg;
-       int ret;
-
-       switch (cc) {
-       case TYPEC_CC_RA:
-               reg = (TCPC_ROLE_CTRL_CC_RA << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                       (TCPC_ROLE_CTRL_CC_RA << TCPC_ROLE_CTRL_CC2_SHIFT);
-               break;
-       case TYPEC_CC_RD:
-               reg = (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                       (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT);
-               break;
-       case TYPEC_CC_RP_DEF:
-               reg = (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                       (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT) |
-                       (TCPC_ROLE_CTRL_RP_VAL_DEF <<
-                        TCPC_ROLE_CTRL_RP_VAL_SHIFT);
-               break;
-       case TYPEC_CC_RP_1_5:
-               reg = (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                       (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT) |
-                       (TCPC_ROLE_CTRL_RP_VAL_1_5 <<
-                        TCPC_ROLE_CTRL_RP_VAL_SHIFT);
-               break;
-       case TYPEC_CC_RP_3_0:
-               reg = (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                       (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT) |
-                       (TCPC_ROLE_CTRL_RP_VAL_3_0 <<
-                        TCPC_ROLE_CTRL_RP_VAL_SHIFT);
-               break;
-       case TYPEC_CC_OPEN:
-       default:
-               reg = (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                       (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC2_SHIFT);
-               break;
-       }
-
-       ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
-static int tcpci_start_drp_toggling(struct tcpc_dev *tcpc,
-                                   enum typec_cc_status cc)
-{
-       int ret;
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       unsigned int reg = TCPC_ROLE_CTRL_DRP;
-
-       /* Handle vendor drp toggling */
-       if (tcpci->data->start_drp_toggling) {
-               ret = tcpci->data->start_drp_toggling(tcpci, tcpci->data, cc);
-               if (ret < 0)
-                       return ret;
-       }
-
-       switch (cc) {
-       default:
-       case TYPEC_CC_RP_DEF:
-               reg |= (TCPC_ROLE_CTRL_RP_VAL_DEF <<
-                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
-               break;
-       case TYPEC_CC_RP_1_5:
-               reg |= (TCPC_ROLE_CTRL_RP_VAL_1_5 <<
-                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
-               break;
-       case TYPEC_CC_RP_3_0:
-               reg |= (TCPC_ROLE_CTRL_RP_VAL_3_0 <<
-                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
-               break;
-       }
-
-       if (cc == TYPEC_CC_RD)
-               reg |= (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                          (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT);
-       else
-               reg |= (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                          (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT);
-       ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
-       if (ret < 0)
-               return ret;
-       return regmap_write(tcpci->regmap, TCPC_COMMAND,
-                           TCPC_CMD_LOOK4CONNECTION);
-}
-
-static enum typec_cc_status tcpci_to_typec_cc(unsigned int cc, bool sink)
-{
-       switch (cc) {
-       case 0x1:
-               return sink ? TYPEC_CC_RP_DEF : TYPEC_CC_RA;
-       case 0x2:
-               return sink ? TYPEC_CC_RP_1_5 : TYPEC_CC_RD;
-       case 0x3:
-               if (sink)
-                       return TYPEC_CC_RP_3_0;
-               /* fall through */
-       case 0x0:
-       default:
-               return TYPEC_CC_OPEN;
-       }
-}
-
-static int tcpci_get_cc(struct tcpc_dev *tcpc,
-                       enum typec_cc_status *cc1, enum typec_cc_status *cc2)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       unsigned int reg;
-       int ret;
-
-       ret = regmap_read(tcpci->regmap, TCPC_CC_STATUS, &reg);
-       if (ret < 0)
-               return ret;
-
-       *cc1 = tcpci_to_typec_cc((reg >> TCPC_CC_STATUS_CC1_SHIFT) &
-                                TCPC_CC_STATUS_CC1_MASK,
-                                reg & TCPC_CC_STATUS_TERM);
-       *cc2 = tcpci_to_typec_cc((reg >> TCPC_CC_STATUS_CC2_SHIFT) &
-                                TCPC_CC_STATUS_CC2_MASK,
-                                reg & TCPC_CC_STATUS_TERM);
-
-       return 0;
-}
-
-static int tcpci_set_polarity(struct tcpc_dev *tcpc,
-                             enum typec_cc_polarity polarity)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       unsigned int reg;
-       int ret;
-
-       /* Keep the disconnect cc line open */
-       ret = regmap_read(tcpci->regmap, TCPC_ROLE_CTRL, &reg);
-       if (ret < 0)
-               return ret;
-
-       if (polarity == TYPEC_POLARITY_CC2)
-               reg |= TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC1_SHIFT;
-       else
-               reg |= TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC2_SHIFT;
-       ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
-       if (ret < 0)
-               return ret;
-
-       return regmap_write(tcpci->regmap, TCPC_TCPC_CTRL,
-                          (polarity == TYPEC_POLARITY_CC2) ?
-                          TCPC_TCPC_CTRL_ORIENTATION : 0);
-}
-
-static int tcpci_set_vconn(struct tcpc_dev *tcpc, bool enable)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       int ret;
-
-       /* Handle vendor set vconn */
-       if (tcpci->data->set_vconn) {
-               ret = tcpci->data->set_vconn(tcpci, tcpci->data, enable);
-               if (ret < 0)
-                       return ret;
-       }
-
-       return regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL,
-                               TCPC_POWER_CTRL_VCONN_ENABLE,
-                               enable ? TCPC_POWER_CTRL_VCONN_ENABLE : 0);
-}
-
-static int tcpci_set_roles(struct tcpc_dev *tcpc, bool attached,
-                          enum typec_role role, enum typec_data_role data)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       unsigned int reg;
-       int ret;
-
-       reg = PD_REV20 << TCPC_MSG_HDR_INFO_REV_SHIFT;
-       if (role == TYPEC_SOURCE)
-               reg |= TCPC_MSG_HDR_INFO_PWR_ROLE;
-       if (data == TYPEC_HOST)
-               reg |= TCPC_MSG_HDR_INFO_DATA_ROLE;
-       ret = regmap_write(tcpci->regmap, TCPC_MSG_HDR_INFO, reg);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
-static int tcpci_set_pd_rx(struct tcpc_dev *tcpc, bool enable)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       unsigned int reg = 0;
-       int ret;
-
-       if (enable)
-               reg = TCPC_RX_DETECT_SOP | TCPC_RX_DETECT_HARD_RESET;
-       ret = regmap_write(tcpci->regmap, TCPC_RX_DETECT, reg);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
-static int tcpci_get_vbus(struct tcpc_dev *tcpc)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       unsigned int reg;
-       int ret;
-
-       ret = regmap_read(tcpci->regmap, TCPC_POWER_STATUS, &reg);
-       if (ret < 0)
-               return ret;
-
-       return !!(reg & TCPC_POWER_STATUS_VBUS_PRES);
-}
-
-static int tcpci_set_vbus(struct tcpc_dev *tcpc, bool source, bool sink)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       int ret;
-
-       /* Disable both source and sink first before enabling anything */
-
-       if (!source) {
-               ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
-                                  TCPC_CMD_DISABLE_SRC_VBUS);
-               if (ret < 0)
-                       return ret;
-       }
-
-       if (!sink) {
-               ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
-                                  TCPC_CMD_DISABLE_SINK_VBUS);
-               if (ret < 0)
-                       return ret;
-       }
-
-       if (source) {
-               ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
-                                  TCPC_CMD_SRC_VBUS_DEFAULT);
-               if (ret < 0)
-                       return ret;
-       }
-
-       if (sink) {
-               ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
-                                  TCPC_CMD_SINK_VBUS);
-               if (ret < 0)
-                       return ret;
-       }
-
-       return 0;
-}
-
-static int tcpci_pd_transmit(struct tcpc_dev *tcpc,
-                            enum tcpm_transmit_type type,
-                            const struct pd_message *msg)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       u16 header = msg ? le16_to_cpu(msg->header) : 0;
-       unsigned int reg, cnt;
-       int ret;
-
-       cnt = msg ? pd_header_cnt(header) * 4 : 0;
-       ret = regmap_write(tcpci->regmap, TCPC_TX_BYTE_CNT, cnt + 2);
-       if (ret < 0)
-               return ret;
-
-       ret = tcpci_write16(tcpci, TCPC_TX_HDR, header);
-       if (ret < 0)
-               return ret;
-
-       if (cnt > 0) {
-               ret = regmap_raw_write(tcpci->regmap, TCPC_TX_DATA,
-                                      &msg->payload, cnt);
-               if (ret < 0)
-                       return ret;
-       }
-
-       reg = (PD_RETRY_COUNT << TCPC_TRANSMIT_RETRY_SHIFT) |
-               (type << TCPC_TRANSMIT_TYPE_SHIFT);
-       ret = regmap_write(tcpci->regmap, TCPC_TRANSMIT, reg);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
-static int tcpci_init(struct tcpc_dev *tcpc)
-{
-       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
-       unsigned long timeout = jiffies + msecs_to_jiffies(2000); /* XXX */
-       unsigned int reg;
-       int ret;
-
-       while (time_before_eq(jiffies, timeout)) {
-               ret = regmap_read(tcpci->regmap, TCPC_POWER_STATUS, &reg);
-               if (ret < 0)
-                       return ret;
-               if (!(reg & TCPC_POWER_STATUS_UNINIT))
-                       break;
-               usleep_range(10000, 20000);
-       }
-       if (time_after(jiffies, timeout))
-               return -ETIMEDOUT;
-
-       /* Handle vendor init */
-       if (tcpci->data->init) {
-               ret = tcpci->data->init(tcpci, tcpci->data);
-               if (ret < 0)
-                       return ret;
-       }
-
-       /* Clear all events */
-       ret = tcpci_write16(tcpci, TCPC_ALERT, 0xffff);
-       if (ret < 0)
-               return ret;
-
-       if (tcpci->controls_vbus)
-               reg = TCPC_POWER_STATUS_VBUS_PRES;
-       else
-               reg = 0;
-       ret = regmap_write(tcpci->regmap, TCPC_POWER_STATUS_MASK, reg);
-       if (ret < 0)
-               return ret;
-
-       /* Enable Vbus detection */
-       ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
-                          TCPC_CMD_ENABLE_VBUS_DETECT);
-       if (ret < 0)
-               return ret;
-
-       reg = TCPC_ALERT_TX_SUCCESS | TCPC_ALERT_TX_FAILED |
-               TCPC_ALERT_TX_DISCARDED | TCPC_ALERT_RX_STATUS |
-               TCPC_ALERT_RX_HARD_RST | TCPC_ALERT_CC_STATUS;
-       if (tcpci->controls_vbus)
-               reg |= TCPC_ALERT_POWER_STATUS;
-       return tcpci_write16(tcpci, TCPC_ALERT_MASK, reg);
-}
-
-irqreturn_t tcpci_irq(struct tcpci *tcpci)
-{
-       u16 status;
-
-       tcpci_read16(tcpci, TCPC_ALERT, &status);
-
-       /*
-        * Clear alert status for everything except RX_STATUS, which shouldn't
-        * be cleared until we have successfully retrieved message.
-        */
-       if (status & ~TCPC_ALERT_RX_STATUS)
-               tcpci_write16(tcpci, TCPC_ALERT,
-                             status & ~TCPC_ALERT_RX_STATUS);
-
-       if (status & TCPC_ALERT_CC_STATUS)
-               tcpm_cc_change(tcpci->port);
-
-       if (status & TCPC_ALERT_POWER_STATUS) {
-               unsigned int reg;
-
-               regmap_read(tcpci->regmap, TCPC_POWER_STATUS_MASK, &reg);
-
-               /*
-                * If power status mask has been reset, then the TCPC
-                * has reset.
-                */
-               if (reg == 0xff)
-                       tcpm_tcpc_reset(tcpci->port);
-               else
-                       tcpm_vbus_change(tcpci->port);
-       }
-
-       if (status & TCPC_ALERT_RX_STATUS) {
-               struct pd_message msg;
-               unsigned int cnt;
-               u16 header;
-
-               regmap_read(tcpci->regmap, TCPC_RX_BYTE_CNT, &cnt);
-
-               tcpci_read16(tcpci, TCPC_RX_HDR, &header);
-               msg.header = cpu_to_le16(header);
-
-               if (WARN_ON(cnt > sizeof(msg.payload)))
-                       cnt = sizeof(msg.payload);
-
-               if (cnt > 0)
-                       regmap_raw_read(tcpci->regmap, TCPC_RX_DATA,
-                                       &msg.payload, cnt);
-
-               /* Read complete, clear RX status alert bit */
-               tcpci_write16(tcpci, TCPC_ALERT, TCPC_ALERT_RX_STATUS);
-
-               tcpm_pd_receive(tcpci->port, &msg);
-       }
-
-       if (status & TCPC_ALERT_RX_HARD_RST)
-               tcpm_pd_hard_reset(tcpci->port);
-
-       if (status & TCPC_ALERT_TX_SUCCESS)
-               tcpm_pd_transmit_complete(tcpci->port, TCPC_TX_SUCCESS);
-       else if (status & TCPC_ALERT_TX_DISCARDED)
-               tcpm_pd_transmit_complete(tcpci->port, TCPC_TX_DISCARDED);
-       else if (status & TCPC_ALERT_TX_FAILED)
-               tcpm_pd_transmit_complete(tcpci->port, TCPC_TX_FAILED);
-
-       return IRQ_HANDLED;
-}
-EXPORT_SYMBOL_GPL(tcpci_irq);
-
-static irqreturn_t _tcpci_irq(int irq, void *dev_id)
-{
-       struct tcpci_chip *chip = dev_id;
-
-       return tcpci_irq(chip->tcpci);
-}
-
-static const struct regmap_config tcpci_regmap_config = {
-       .reg_bits = 8,
-       .val_bits = 8,
-
-       .max_register = 0x7F, /* 0x80 .. 0xFF are vendor defined */
-};
-
-static int tcpci_parse_config(struct tcpci *tcpci)
-{
-       tcpci->controls_vbus = true; /* XXX */
-
-       tcpci->tcpc.fwnode = device_get_named_child_node(tcpci->dev,
-                                                        "connector");
-       if (!tcpci->tcpc.fwnode) {
-               dev_err(tcpci->dev, "Can't find connector node.\n");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
-{
-       struct tcpci *tcpci;
-       int err;
-
-       tcpci = devm_kzalloc(dev, sizeof(*tcpci), GFP_KERNEL);
-       if (!tcpci)
-               return ERR_PTR(-ENOMEM);
-
-       tcpci->dev = dev;
-       tcpci->data = data;
-       tcpci->regmap = data->regmap;
-
-       tcpci->tcpc.init = tcpci_init;
-       tcpci->tcpc.get_vbus = tcpci_get_vbus;
-       tcpci->tcpc.set_vbus = tcpci_set_vbus;
-       tcpci->tcpc.set_cc = tcpci_set_cc;
-       tcpci->tcpc.get_cc = tcpci_get_cc;
-       tcpci->tcpc.set_polarity = tcpci_set_polarity;
-       tcpci->tcpc.set_vconn = tcpci_set_vconn;
-       tcpci->tcpc.start_drp_toggling = tcpci_start_drp_toggling;
-
-       tcpci->tcpc.set_pd_rx = tcpci_set_pd_rx;
-       tcpci->tcpc.set_roles = tcpci_set_roles;
-       tcpci->tcpc.pd_transmit = tcpci_pd_transmit;
-
-       err = tcpci_parse_config(tcpci);
-       if (err < 0)
-               return ERR_PTR(err);
-
-       tcpci->port = tcpm_register_port(tcpci->dev, &tcpci->tcpc);
-       if (IS_ERR(tcpci->port))
-               return ERR_CAST(tcpci->port);
-
-       return tcpci;
-}
-EXPORT_SYMBOL_GPL(tcpci_register_port);
-
-void tcpci_unregister_port(struct tcpci *tcpci)
-{
-       tcpm_unregister_port(tcpci->port);
-}
-EXPORT_SYMBOL_GPL(tcpci_unregister_port);
-
-static int tcpci_probe(struct i2c_client *client,
-                      const struct i2c_device_id *i2c_id)
-{
-       struct tcpci_chip *chip;
-       int err;
-       u16 val = 0;
-
-       chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
-       if (!chip)
-               return -ENOMEM;
-
-       chip->data.regmap = devm_regmap_init_i2c(client, &tcpci_regmap_config);
-       if (IS_ERR(chip->data.regmap))
-               return PTR_ERR(chip->data.regmap);
-
-       i2c_set_clientdata(client, chip);
-
-       /* Disable chip interrupts before requesting irq */
-       err = regmap_raw_write(chip->data.regmap, TCPC_ALERT_MASK, &val,
-                              sizeof(u16));
-       if (err < 0)
-               return err;
-
-       chip->tcpci = tcpci_register_port(&client->dev, &chip->data);
-       if (IS_ERR(chip->tcpci))
-               return PTR_ERR(chip->tcpci);
-
-       err = devm_request_threaded_irq(&client->dev, client->irq, NULL,
-                                       _tcpci_irq,
-                                       IRQF_ONESHOT | IRQF_TRIGGER_LOW,
-                                       dev_name(&client->dev), chip);
-       if (err < 0) {
-               tcpci_unregister_port(chip->tcpci);
-               return err;
-       }
-
-       return 0;
-}
-
-static int tcpci_remove(struct i2c_client *client)
-{
-       struct tcpci_chip *chip = i2c_get_clientdata(client);
-
-       tcpci_unregister_port(chip->tcpci);
-
-       return 0;
-}
-
-static const struct i2c_device_id tcpci_id[] = {
-       { "tcpci", 0 },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, tcpci_id);
-
-#ifdef CONFIG_OF
-static const struct of_device_id tcpci_of_match[] = {
-       { .compatible = "nxp,ptn5110", },
-       {},
-};
-MODULE_DEVICE_TABLE(of, tcpci_of_match);
-#endif
-
-static struct i2c_driver tcpci_i2c_driver = {
-       .driver = {
-               .name = "tcpci",
-               .of_match_table = of_match_ptr(tcpci_of_match),
-       },
-       .probe = tcpci_probe,
-       .remove = tcpci_remove,
-       .id_table = tcpci_id,
-};
-module_i2c_driver(tcpci_i2c_driver);
-
-MODULE_DESCRIPTION("USB Type-C Port Controller Interface driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/usb/typec/tcpci.h b/drivers/usb/typec/tcpci.h
deleted file mode 100644 (file)
index 303ebde..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2015-2017 Google, Inc
- *
- * USB Type-C Port Controller Interface.
- */
-
-#ifndef __LINUX_USB_TCPCI_H
-#define __LINUX_USB_TCPCI_H
-
-#define TCPC_VENDOR_ID                 0x0
-#define TCPC_PRODUCT_ID                        0x2
-#define TCPC_BCD_DEV                   0x4
-#define TCPC_TC_REV                    0x6
-#define TCPC_PD_REV                    0x8
-#define TCPC_PD_INT_REV                        0xa
-
-#define TCPC_ALERT                     0x10
-#define TCPC_ALERT_VBUS_DISCNCT                BIT(11)
-#define TCPC_ALERT_RX_BUF_OVF          BIT(10)
-#define TCPC_ALERT_FAULT               BIT(9)
-#define TCPC_ALERT_V_ALARM_LO          BIT(8)
-#define TCPC_ALERT_V_ALARM_HI          BIT(7)
-#define TCPC_ALERT_TX_SUCCESS          BIT(6)
-#define TCPC_ALERT_TX_DISCARDED                BIT(5)
-#define TCPC_ALERT_TX_FAILED           BIT(4)
-#define TCPC_ALERT_RX_HARD_RST         BIT(3)
-#define TCPC_ALERT_RX_STATUS           BIT(2)
-#define TCPC_ALERT_POWER_STATUS                BIT(1)
-#define TCPC_ALERT_CC_STATUS           BIT(0)
-
-#define TCPC_ALERT_MASK                        0x12
-#define TCPC_POWER_STATUS_MASK         0x14
-#define TCPC_FAULT_STATUS_MASK         0x15
-#define TCPC_CONFIG_STD_OUTPUT         0x18
-
-#define TCPC_TCPC_CTRL                 0x19
-#define TCPC_TCPC_CTRL_ORIENTATION     BIT(0)
-
-#define TCPC_ROLE_CTRL                 0x1a
-#define TCPC_ROLE_CTRL_DRP             BIT(6)
-#define TCPC_ROLE_CTRL_RP_VAL_SHIFT    4
-#define TCPC_ROLE_CTRL_RP_VAL_MASK     0x3
-#define TCPC_ROLE_CTRL_RP_VAL_DEF      0x0
-#define TCPC_ROLE_CTRL_RP_VAL_1_5      0x1
-#define TCPC_ROLE_CTRL_RP_VAL_3_0      0x2
-#define TCPC_ROLE_CTRL_CC2_SHIFT       2
-#define TCPC_ROLE_CTRL_CC2_MASK                0x3
-#define TCPC_ROLE_CTRL_CC1_SHIFT       0
-#define TCPC_ROLE_CTRL_CC1_MASK                0x3
-#define TCPC_ROLE_CTRL_CC_RA           0x0
-#define TCPC_ROLE_CTRL_CC_RP           0x1
-#define TCPC_ROLE_CTRL_CC_RD           0x2
-#define TCPC_ROLE_CTRL_CC_OPEN         0x3
-
-#define TCPC_FAULT_CTRL                        0x1b
-
-#define TCPC_POWER_CTRL                        0x1c
-#define TCPC_POWER_CTRL_VCONN_ENABLE   BIT(0)
-
-#define TCPC_CC_STATUS                 0x1d
-#define TCPC_CC_STATUS_TOGGLING                BIT(5)
-#define TCPC_CC_STATUS_TERM            BIT(4)
-#define TCPC_CC_STATUS_CC2_SHIFT       2
-#define TCPC_CC_STATUS_CC2_MASK                0x3
-#define TCPC_CC_STATUS_CC1_SHIFT       0
-#define TCPC_CC_STATUS_CC1_MASK                0x3
-
-#define TCPC_POWER_STATUS              0x1e
-#define TCPC_POWER_STATUS_UNINIT       BIT(6)
-#define TCPC_POWER_STATUS_VBUS_DET     BIT(3)
-#define TCPC_POWER_STATUS_VBUS_PRES    BIT(2)
-
-#define TCPC_FAULT_STATUS              0x1f
-
-#define TCPC_COMMAND                   0x23
-#define TCPC_CMD_WAKE_I2C              0x11
-#define TCPC_CMD_DISABLE_VBUS_DETECT   0x22
-#define TCPC_CMD_ENABLE_VBUS_DETECT    0x33
-#define TCPC_CMD_DISABLE_SINK_VBUS     0x44
-#define TCPC_CMD_SINK_VBUS             0x55
-#define TCPC_CMD_DISABLE_SRC_VBUS      0x66
-#define TCPC_CMD_SRC_VBUS_DEFAULT      0x77
-#define TCPC_CMD_SRC_VBUS_HIGH         0x88
-#define TCPC_CMD_LOOK4CONNECTION       0x99
-#define TCPC_CMD_RXONEMORE             0xAA
-#define TCPC_CMD_I2C_IDLE              0xFF
-
-#define TCPC_DEV_CAP_1                 0x24
-#define TCPC_DEV_CAP_2                 0x26
-#define TCPC_STD_INPUT_CAP             0x28
-#define TCPC_STD_OUTPUT_CAP            0x29
-
-#define TCPC_MSG_HDR_INFO              0x2e
-#define TCPC_MSG_HDR_INFO_DATA_ROLE    BIT(3)
-#define TCPC_MSG_HDR_INFO_PWR_ROLE     BIT(0)
-#define TCPC_MSG_HDR_INFO_REV_SHIFT    1
-#define TCPC_MSG_HDR_INFO_REV_MASK     0x3
-
-#define TCPC_RX_DETECT                 0x2f
-#define TCPC_RX_DETECT_HARD_RESET      BIT(5)
-#define TCPC_RX_DETECT_SOP             BIT(0)
-
-#define TCPC_RX_BYTE_CNT               0x30
-#define TCPC_RX_BUF_FRAME_TYPE         0x31
-#define TCPC_RX_HDR                    0x32
-#define TCPC_RX_DATA                   0x34 /* through 0x4f */
-
-#define TCPC_TRANSMIT                  0x50
-#define TCPC_TRANSMIT_RETRY_SHIFT      4
-#define TCPC_TRANSMIT_RETRY_MASK       0x3
-#define TCPC_TRANSMIT_TYPE_SHIFT       0
-#define TCPC_TRANSMIT_TYPE_MASK                0x7
-
-#define TCPC_TX_BYTE_CNT               0x51
-#define TCPC_TX_HDR                    0x52
-#define TCPC_TX_DATA                   0x54 /* through 0x6f */
-
-#define TCPC_VBUS_VOLTAGE                      0x70
-#define TCPC_VBUS_SINK_DISCONNECT_THRESH       0x72
-#define TCPC_VBUS_STOP_DISCHARGE_THRESH                0x74
-#define TCPC_VBUS_VOLTAGE_ALARM_HI_CFG         0x76
-#define TCPC_VBUS_VOLTAGE_ALARM_LO_CFG         0x78
-
-struct tcpci;
-struct tcpci_data {
-       struct regmap *regmap;
-       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);
-};
-
-struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data);
-void tcpci_unregister_port(struct tcpci *tcpci);
-irqreturn_t tcpci_irq(struct tcpci *tcpci);
-
-#endif /* __LINUX_USB_TCPCI_H */
diff --git a/drivers/usb/typec/tcpci_rt1711h.c b/drivers/usb/typec/tcpci_rt1711h.c
deleted file mode 100644 (file)
index 0173890..0000000
+++ /dev/null
@@ -1,312 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018, Richtek Technology Corporation
- *
- * Richtek RT1711H Type-C Chip Driver
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/i2c.h>
-#include <linux/interrupt.h>
-#include <linux/gpio/consumer.h>
-#include <linux/usb/tcpm.h>
-#include <linux/regmap.h>
-#include "tcpci.h"
-
-#define RT1711H_VID            0x29CF
-#define RT1711H_PID            0x1711
-
-#define RT1711H_RTCTRL8                0x9B
-
-/* Autoidle timeout = (tout * 2 + 1) * 6.4ms */
-#define RT1711H_RTCTRL8_SET(ck300, ship_off, auto_idle, tout) \
-                           (((ck300) << 7) | ((ship_off) << 5) | \
-                           ((auto_idle) << 3) | ((tout) & 0x07))
-
-#define RT1711H_RTCTRL11       0x9E
-
-/* I2C timeout = (tout + 1) * 12.5ms */
-#define RT1711H_RTCTRL11_SET(en, tout) \
-                            (((en) << 7) | ((tout) & 0x0F))
-
-#define RT1711H_RTCTRL13       0xA0
-#define RT1711H_RTCTRL14       0xA1
-#define RT1711H_RTCTRL15       0xA2
-#define RT1711H_RTCTRL16       0xA3
-
-struct rt1711h_chip {
-       struct tcpci_data data;
-       struct tcpci *tcpci;
-       struct device *dev;
-};
-
-static int rt1711h_read16(struct rt1711h_chip *chip, unsigned int reg, u16 *val)
-{
-       return regmap_raw_read(chip->data.regmap, reg, val, sizeof(u16));
-}
-
-static int rt1711h_write16(struct rt1711h_chip *chip, unsigned int reg, u16 val)
-{
-       return regmap_raw_write(chip->data.regmap, reg, &val, sizeof(u16));
-}
-
-static int rt1711h_read8(struct rt1711h_chip *chip, unsigned int reg, u8 *val)
-{
-       return regmap_raw_read(chip->data.regmap, reg, val, sizeof(u8));
-}
-
-static int rt1711h_write8(struct rt1711h_chip *chip, unsigned int reg, u8 val)
-{
-       return regmap_raw_write(chip->data.regmap, reg, &val, sizeof(u8));
-}
-
-static const struct regmap_config rt1711h_regmap_config = {
-       .reg_bits = 8,
-       .val_bits = 8,
-
-       .max_register = 0xFF, /* 0x80 .. 0xFF are vendor defined */
-};
-
-static struct rt1711h_chip *tdata_to_rt1711h(struct tcpci_data *tdata)
-{
-       return container_of(tdata, struct rt1711h_chip, data);
-}
-
-static int rt1711h_init(struct tcpci *tcpci, struct tcpci_data *tdata)
-{
-       int ret;
-       struct rt1711h_chip *chip = tdata_to_rt1711h(tdata);
-
-       /* CK 300K from 320K, shipping off, auto_idle enable, tout = 32ms */
-       ret = rt1711h_write8(chip, RT1711H_RTCTRL8,
-                            RT1711H_RTCTRL8_SET(0, 1, 1, 2));
-       if (ret < 0)
-               return ret;
-
-       /* I2C reset : (val + 1) * 12.5ms */
-       ret = rt1711h_write8(chip, RT1711H_RTCTRL11,
-                            RT1711H_RTCTRL11_SET(1, 0x0F));
-       if (ret < 0)
-               return ret;
-
-       /* tTCPCfilter : (26.7 * val) us */
-       ret = rt1711h_write8(chip, RT1711H_RTCTRL14, 0x0F);
-       if (ret < 0)
-               return ret;
-
-       /*  tDRP : (51.2 + 6.4 * val) ms */
-       ret = rt1711h_write8(chip, RT1711H_RTCTRL15, 0x04);
-       if (ret < 0)
-               return ret;
-
-       /* dcSRC.DRP : 33% */
-       return rt1711h_write16(chip, RT1711H_RTCTRL16, 330);
-}
-
-static int rt1711h_set_vconn(struct tcpci *tcpci, struct tcpci_data *tdata,
-                            bool enable)
-{
-       struct rt1711h_chip *chip = tdata_to_rt1711h(tdata);
-
-       return rt1711h_write8(chip, RT1711H_RTCTRL8,
-                             RT1711H_RTCTRL8_SET(0, 1, !enable, 2));
-}
-
-static int rt1711h_start_drp_toggling(struct tcpci *tcpci,
-                                     struct tcpci_data *tdata,
-                                     enum typec_cc_status cc)
-{
-       struct rt1711h_chip *chip = tdata_to_rt1711h(tdata);
-       int ret;
-       unsigned int reg = 0;
-
-       switch (cc) {
-       default:
-       case TYPEC_CC_RP_DEF:
-               reg |= (TCPC_ROLE_CTRL_RP_VAL_DEF <<
-                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
-               break;
-       case TYPEC_CC_RP_1_5:
-               reg |= (TCPC_ROLE_CTRL_RP_VAL_1_5 <<
-                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
-               break;
-       case TYPEC_CC_RP_3_0:
-               reg |= (TCPC_ROLE_CTRL_RP_VAL_3_0 <<
-                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
-               break;
-       }
-
-       if (cc == TYPEC_CC_RD)
-               reg |= (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                          (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT);
-       else
-               reg |= (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
-                          (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT);
-
-       ret = rt1711h_write8(chip, TCPC_ROLE_CTRL, reg);
-       if (ret < 0)
-               return ret;
-       usleep_range(500, 1000);
-
-       return 0;
-}
-
-static irqreturn_t rt1711h_irq(int irq, void *dev_id)
-{
-       int ret;
-       u16 alert;
-       u8 status;
-       struct rt1711h_chip *chip = dev_id;
-
-       if (!chip->tcpci)
-               return IRQ_HANDLED;
-
-       ret = rt1711h_read16(chip, TCPC_ALERT, &alert);
-       if (ret < 0)
-               goto out;
-
-       if (alert & TCPC_ALERT_CC_STATUS) {
-               ret = rt1711h_read8(chip, TCPC_CC_STATUS, &status);
-               if (ret < 0)
-                       goto out;
-               /* Clear cc change event triggered by starting toggling */
-               if (status & TCPC_CC_STATUS_TOGGLING)
-                       rt1711h_write8(chip, TCPC_ALERT, TCPC_ALERT_CC_STATUS);
-       }
-
-out:
-       return tcpci_irq(chip->tcpci);
-}
-
-static int rt1711h_init_alert(struct rt1711h_chip *chip,
-                             struct i2c_client *client)
-{
-       int ret;
-
-       /* Disable chip interrupts before requesting irq */
-       ret = rt1711h_write16(chip, TCPC_ALERT_MASK, 0);
-       if (ret < 0)
-               return ret;
-
-       ret = devm_request_threaded_irq(chip->dev, client->irq, NULL,
-                                       rt1711h_irq,
-                                       IRQF_ONESHOT | IRQF_TRIGGER_LOW,
-                                       dev_name(chip->dev), chip);
-       if (ret < 0)
-               return ret;
-       enable_irq_wake(client->irq);
-       return 0;
-}
-
-static int rt1711h_sw_reset(struct rt1711h_chip *chip)
-{
-       int ret;
-
-       ret = rt1711h_write8(chip, RT1711H_RTCTRL13, 0x01);
-       if (ret < 0)
-               return ret;
-
-       usleep_range(1000, 2000);
-       return 0;
-}
-
-static int rt1711h_check_revision(struct i2c_client *i2c)
-{
-       int ret;
-
-       ret = i2c_smbus_read_word_data(i2c, TCPC_VENDOR_ID);
-       if (ret < 0)
-               return ret;
-       if (ret != RT1711H_VID) {
-               dev_err(&i2c->dev, "vid is not correct, 0x%04x\n", ret);
-               return -ENODEV;
-       }
-       ret = i2c_smbus_read_word_data(i2c, TCPC_PRODUCT_ID);
-       if (ret < 0)
-               return ret;
-       if (ret != RT1711H_PID) {
-               dev_err(&i2c->dev, "pid is not correct, 0x%04x\n", ret);
-               return -ENODEV;
-       }
-       return 0;
-}
-
-static int rt1711h_probe(struct i2c_client *client,
-                        const struct i2c_device_id *i2c_id)
-{
-       int ret;
-       struct rt1711h_chip *chip;
-
-       ret = rt1711h_check_revision(client);
-       if (ret < 0) {
-               dev_err(&client->dev, "check vid/pid fail\n");
-               return ret;
-       }
-
-       chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
-       if (!chip)
-               return -ENOMEM;
-
-       chip->data.regmap = devm_regmap_init_i2c(client,
-                                                &rt1711h_regmap_config);
-       if (IS_ERR(chip->data.regmap))
-               return PTR_ERR(chip->data.regmap);
-
-       chip->dev = &client->dev;
-       i2c_set_clientdata(client, chip);
-
-       ret = rt1711h_sw_reset(chip);
-       if (ret < 0)
-               return ret;
-
-       ret = rt1711h_init_alert(chip, client);
-       if (ret < 0)
-               return ret;
-
-       chip->data.init = rt1711h_init;
-       chip->data.set_vconn = rt1711h_set_vconn;
-       chip->data.start_drp_toggling = rt1711h_start_drp_toggling;
-       chip->tcpci = tcpci_register_port(chip->dev, &chip->data);
-       if (IS_ERR_OR_NULL(chip->tcpci))
-               return PTR_ERR(chip->tcpci);
-
-       return 0;
-}
-
-static int rt1711h_remove(struct i2c_client *client)
-{
-       struct rt1711h_chip *chip = i2c_get_clientdata(client);
-
-       tcpci_unregister_port(chip->tcpci);
-       return 0;
-}
-
-static const struct i2c_device_id rt1711h_id[] = {
-       { "rt1711h", 0 },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, rt1711h_id);
-
-#ifdef CONFIG_OF
-static const struct of_device_id rt1711h_of_match[] = {
-       { .compatible = "richtek,rt1711h", },
-       {},
-};
-MODULE_DEVICE_TABLE(of, rt1711h_of_match);
-#endif
-
-static struct i2c_driver rt1711h_i2c_driver = {
-       .driver = {
-               .name = "rt1711h",
-               .of_match_table = of_match_ptr(rt1711h_of_match),
-       },
-       .probe = rt1711h_probe,
-       .remove = rt1711h_remove,
-       .id_table = rt1711h_id,
-};
-module_i2c_driver(rt1711h_i2c_driver);
-
-MODULE_AUTHOR("ShuFan Lee <shufan_lee@richtek.com>");
-MODULE_DESCRIPTION("RT1711H USB Type-C Port Controller Interface Driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
deleted file mode 100644 (file)
index 4f1f421..0000000
+++ /dev/null
@@ -1,4851 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2015-2017 Google, Inc
- *
- * USB Power Delivery protocol stack.
- */
-
-#include <linux/completion.h>
-#include <linux/debugfs.h>
-#include <linux/device.h>
-#include <linux/jiffies.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/power_supply.h>
-#include <linux/proc_fs.h>
-#include <linux/property.h>
-#include <linux/sched/clock.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/usb/pd.h>
-#include <linux/usb/pd_ado.h>
-#include <linux/usb/pd_bdo.h>
-#include <linux/usb/pd_ext_sdb.h>
-#include <linux/usb/pd_vdo.h>
-#include <linux/usb/role.h>
-#include <linux/usb/tcpm.h>
-#include <linux/usb/typec_altmode.h>
-#include <linux/workqueue.h>
-
-#define FOREACH_STATE(S)                       \
-       S(INVALID_STATE),                       \
-       S(DRP_TOGGLING),                        \
-       S(SRC_UNATTACHED),                      \
-       S(SRC_ATTACH_WAIT),                     \
-       S(SRC_ATTACHED),                        \
-       S(SRC_STARTUP),                         \
-       S(SRC_SEND_CAPABILITIES),               \
-       S(SRC_NEGOTIATE_CAPABILITIES),          \
-       S(SRC_TRANSITION_SUPPLY),               \
-       S(SRC_READY),                           \
-       S(SRC_WAIT_NEW_CAPABILITIES),           \
-                                               \
-       S(SNK_UNATTACHED),                      \
-       S(SNK_ATTACH_WAIT),                     \
-       S(SNK_DEBOUNCED),                       \
-       S(SNK_ATTACHED),                        \
-       S(SNK_STARTUP),                         \
-       S(SNK_DISCOVERY),                       \
-       S(SNK_DISCOVERY_DEBOUNCE),              \
-       S(SNK_DISCOVERY_DEBOUNCE_DONE),         \
-       S(SNK_WAIT_CAPABILITIES),               \
-       S(SNK_NEGOTIATE_CAPABILITIES),          \
-       S(SNK_NEGOTIATE_PPS_CAPABILITIES),      \
-       S(SNK_TRANSITION_SINK),                 \
-       S(SNK_TRANSITION_SINK_VBUS),            \
-       S(SNK_READY),                           \
-                                               \
-       S(ACC_UNATTACHED),                      \
-       S(DEBUG_ACC_ATTACHED),                  \
-       S(AUDIO_ACC_ATTACHED),                  \
-       S(AUDIO_ACC_DEBOUNCE),                  \
-                                               \
-       S(HARD_RESET_SEND),                     \
-       S(HARD_RESET_START),                    \
-       S(SRC_HARD_RESET_VBUS_OFF),             \
-       S(SRC_HARD_RESET_VBUS_ON),              \
-       S(SNK_HARD_RESET_SINK_OFF),             \
-       S(SNK_HARD_RESET_WAIT_VBUS),            \
-       S(SNK_HARD_RESET_SINK_ON),              \
-                                               \
-       S(SOFT_RESET),                          \
-       S(SOFT_RESET_SEND),                     \
-                                               \
-       S(DR_SWAP_ACCEPT),                      \
-       S(DR_SWAP_SEND),                        \
-       S(DR_SWAP_SEND_TIMEOUT),                \
-       S(DR_SWAP_CANCEL),                      \
-       S(DR_SWAP_CHANGE_DR),                   \
-                                               \
-       S(PR_SWAP_ACCEPT),                      \
-       S(PR_SWAP_SEND),                        \
-       S(PR_SWAP_SEND_TIMEOUT),                \
-       S(PR_SWAP_CANCEL),                      \
-       S(PR_SWAP_START),                       \
-       S(PR_SWAP_SRC_SNK_TRANSITION_OFF),      \
-       S(PR_SWAP_SRC_SNK_SOURCE_OFF),          \
-       S(PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED), \
-       S(PR_SWAP_SRC_SNK_SINK_ON),             \
-       S(PR_SWAP_SNK_SRC_SINK_OFF),            \
-       S(PR_SWAP_SNK_SRC_SOURCE_ON),           \
-       S(PR_SWAP_SNK_SRC_SOURCE_ON_VBUS_RAMPED_UP),    \
-                                               \
-       S(VCONN_SWAP_ACCEPT),                   \
-       S(VCONN_SWAP_SEND),                     \
-       S(VCONN_SWAP_SEND_TIMEOUT),             \
-       S(VCONN_SWAP_CANCEL),                   \
-       S(VCONN_SWAP_START),                    \
-       S(VCONN_SWAP_WAIT_FOR_VCONN),           \
-       S(VCONN_SWAP_TURN_ON_VCONN),            \
-       S(VCONN_SWAP_TURN_OFF_VCONN),           \
-                                               \
-       S(SNK_TRY),                             \
-       S(SNK_TRY_WAIT),                        \
-       S(SNK_TRY_WAIT_DEBOUNCE),               \
-       S(SNK_TRY_WAIT_DEBOUNCE_CHECK_VBUS),    \
-       S(SRC_TRYWAIT),                         \
-       S(SRC_TRYWAIT_DEBOUNCE),                \
-       S(SRC_TRYWAIT_UNATTACHED),              \
-                                               \
-       S(SRC_TRY),                             \
-       S(SRC_TRY_WAIT),                        \
-       S(SRC_TRY_DEBOUNCE),                    \
-       S(SNK_TRYWAIT),                         \
-       S(SNK_TRYWAIT_DEBOUNCE),                \
-       S(SNK_TRYWAIT_VBUS),                    \
-       S(BIST_RX),                             \
-                                               \
-       S(GET_STATUS_SEND),                     \
-       S(GET_STATUS_SEND_TIMEOUT),             \
-       S(GET_PPS_STATUS_SEND),                 \
-       S(GET_PPS_STATUS_SEND_TIMEOUT),         \
-                                               \
-       S(ERROR_RECOVERY),                      \
-       S(PORT_RESET),                          \
-       S(PORT_RESET_WAIT_OFF)
-
-#define GENERATE_ENUM(e)       e
-#define GENERATE_STRING(s)     #s
-
-enum tcpm_state {
-       FOREACH_STATE(GENERATE_ENUM)
-};
-
-static const char * const tcpm_states[] = {
-       FOREACH_STATE(GENERATE_STRING)
-};
-
-enum vdm_states {
-       VDM_STATE_ERR_BUSY = -3,
-       VDM_STATE_ERR_SEND = -2,
-       VDM_STATE_ERR_TMOUT = -1,
-       VDM_STATE_DONE = 0,
-       /* Anything >0 represents an active state */
-       VDM_STATE_READY = 1,
-       VDM_STATE_BUSY = 2,
-       VDM_STATE_WAIT_RSP_BUSY = 3,
-};
-
-enum pd_msg_request {
-       PD_MSG_NONE = 0,
-       PD_MSG_CTRL_REJECT,
-       PD_MSG_CTRL_WAIT,
-       PD_MSG_CTRL_NOT_SUPP,
-       PD_MSG_DATA_SINK_CAP,
-       PD_MSG_DATA_SOURCE_CAP,
-};
-
-/* Events from low level driver */
-
-#define TCPM_CC_EVENT          BIT(0)
-#define TCPM_VBUS_EVENT                BIT(1)
-#define TCPM_RESET_EVENT       BIT(2)
-
-#define LOG_BUFFER_ENTRIES     1024
-#define LOG_BUFFER_ENTRY_SIZE  128
-
-/* Alternate mode support */
-
-#define SVID_DISCOVERY_MAX     16
-#define ALTMODE_DISCOVERY_MAX  (SVID_DISCOVERY_MAX * MODE_DISCOVERY_MAX)
-
-struct pd_mode_data {
-       int svid_index;         /* current SVID index           */
-       int nsvids;
-       u16 svids[SVID_DISCOVERY_MAX];
-       int altmodes;           /* number of alternate modes    */
-       struct typec_altmode_desc altmode_desc[ALTMODE_DISCOVERY_MAX];
-};
-
-struct pd_pps_data {
-       u32 min_volt;
-       u32 max_volt;
-       u32 max_curr;
-       u32 out_volt;
-       u32 op_curr;
-       bool supported;
-       bool active;
-};
-
-struct tcpm_port {
-       struct device *dev;
-
-       struct mutex lock;              /* tcpm state machine lock */
-       struct workqueue_struct *wq;
-
-       struct typec_capability typec_caps;
-       struct typec_port *typec_port;
-
-       struct tcpc_dev *tcpc;
-       struct usb_role_switch *role_sw;
-
-       enum typec_role vconn_role;
-       enum typec_role pwr_role;
-       enum typec_data_role data_role;
-       enum typec_pwr_opmode pwr_opmode;
-
-       struct usb_pd_identity partner_ident;
-       struct typec_partner_desc partner_desc;
-       struct typec_partner *partner;
-
-       enum typec_cc_status cc_req;
-
-       enum typec_cc_status cc1;
-       enum typec_cc_status cc2;
-       enum typec_cc_polarity polarity;
-
-       bool attached;
-       bool connected;
-       enum typec_port_type port_type;
-       bool vbus_present;
-       bool vbus_never_low;
-       bool vbus_source;
-       bool vbus_charge;
-
-       bool send_discover;
-       bool op_vsafe5v;
-
-       int try_role;
-       int try_snk_count;
-       int try_src_count;
-
-       enum pd_msg_request queued_message;
-
-       enum tcpm_state enter_state;
-       enum tcpm_state prev_state;
-       enum tcpm_state state;
-       enum tcpm_state delayed_state;
-       unsigned long delayed_runtime;
-       unsigned long delay_ms;
-
-       spinlock_t pd_event_lock;
-       u32 pd_events;
-
-       struct work_struct event_work;
-       struct delayed_work state_machine;
-       struct delayed_work vdm_state_machine;
-       bool state_machine_running;
-
-       struct completion tx_complete;
-       enum tcpm_transmit_status tx_status;
-
-       struct mutex swap_lock;         /* swap command lock */
-       bool swap_pending;
-       bool non_pd_role_swap;
-       struct completion swap_complete;
-       int swap_status;
-
-       unsigned int negotiated_rev;
-       unsigned int message_id;
-       unsigned int caps_count;
-       unsigned int hard_reset_count;
-       bool pd_capable;
-       bool explicit_contract;
-       unsigned int rx_msgid;
-
-       /* Partner capabilities/requests */
-       u32 sink_request;
-       u32 source_caps[PDO_MAX_OBJECTS];
-       unsigned int nr_source_caps;
-       u32 sink_caps[PDO_MAX_OBJECTS];
-       unsigned int nr_sink_caps;
-
-       /* Local capabilities */
-       u32 src_pdo[PDO_MAX_OBJECTS];
-       unsigned int nr_src_pdo;
-       u32 snk_pdo[PDO_MAX_OBJECTS];
-       unsigned int nr_snk_pdo;
-       u32 snk_vdo[VDO_MAX_OBJECTS];
-       unsigned int nr_snk_vdo;
-
-       unsigned int operating_snk_mw;
-       bool update_sink_caps;
-
-       /* Requested current / voltage */
-       u32 current_limit;
-       u32 supply_voltage;
-
-       /* Used to export TA voltage and current */
-       struct power_supply *psy;
-       struct power_supply_desc psy_desc;
-       enum power_supply_usb_type usb_type;
-
-       u32 bist_request;
-
-       /* PD state for Vendor Defined Messages */
-       enum vdm_states vdm_state;
-       u32 vdm_retries;
-       /* next Vendor Defined Message to send */
-       u32 vdo_data[VDO_MAX_SIZE];
-       u8 vdo_count;
-       /* VDO to retry if UFP responder replied busy */
-       u32 vdo_retry;
-
-       /* PPS */
-       struct pd_pps_data pps_data;
-       struct completion pps_complete;
-       bool pps_pending;
-       int pps_status;
-
-       /* Alternate mode data */
-       struct pd_mode_data mode_data;
-       struct typec_altmode *partner_altmode[ALTMODE_DISCOVERY_MAX];
-       struct typec_altmode *port_altmode[ALTMODE_DISCOVERY_MAX];
-
-       /* Deadline in jiffies to exit src_try_wait state */
-       unsigned long max_wait;
-
-#ifdef CONFIG_DEBUG_FS
-       struct dentry *dentry;
-       struct mutex logbuffer_lock;    /* log buffer access lock */
-       int logbuffer_head;
-       int logbuffer_tail;
-       u8 *logbuffer[LOG_BUFFER_ENTRIES];
-#endif
-};
-
-struct pd_rx_event {
-       struct work_struct work;
-       struct tcpm_port *port;
-       struct pd_message msg;
-};
-
-#define tcpm_cc_is_sink(cc) \
-       ((cc) == TYPEC_CC_RP_DEF || (cc) == TYPEC_CC_RP_1_5 || \
-        (cc) == TYPEC_CC_RP_3_0)
-
-#define tcpm_port_is_sink(port) \
-       ((tcpm_cc_is_sink((port)->cc1) && !tcpm_cc_is_sink((port)->cc2)) || \
-        (tcpm_cc_is_sink((port)->cc2) && !tcpm_cc_is_sink((port)->cc1)))
-
-#define tcpm_cc_is_source(cc) ((cc) == TYPEC_CC_RD)
-#define tcpm_cc_is_audio(cc) ((cc) == TYPEC_CC_RA)
-#define tcpm_cc_is_open(cc) ((cc) == TYPEC_CC_OPEN)
-
-#define tcpm_port_is_source(port) \
-       ((tcpm_cc_is_source((port)->cc1) && \
-        !tcpm_cc_is_source((port)->cc2)) || \
-        (tcpm_cc_is_source((port)->cc2) && \
-         !tcpm_cc_is_source((port)->cc1)))
-
-#define tcpm_port_is_debug(port) \
-       (tcpm_cc_is_source((port)->cc1) && tcpm_cc_is_source((port)->cc2))
-
-#define tcpm_port_is_audio(port) \
-       (tcpm_cc_is_audio((port)->cc1) && tcpm_cc_is_audio((port)->cc2))
-
-#define tcpm_port_is_audio_detached(port) \
-       ((tcpm_cc_is_audio((port)->cc1) && tcpm_cc_is_open((port)->cc2)) || \
-        (tcpm_cc_is_audio((port)->cc2) && tcpm_cc_is_open((port)->cc1)))
-
-#define tcpm_try_snk(port) \
-       ((port)->try_snk_count == 0 && (port)->try_role == TYPEC_SINK && \
-       (port)->port_type == TYPEC_PORT_DRP)
-
-#define tcpm_try_src(port) \
-       ((port)->try_src_count == 0 && (port)->try_role == TYPEC_SOURCE && \
-       (port)->port_type == TYPEC_PORT_DRP)
-
-static enum tcpm_state tcpm_default_state(struct tcpm_port *port)
-{
-       if (port->port_type == TYPEC_PORT_DRP) {
-               if (port->try_role == TYPEC_SINK)
-                       return SNK_UNATTACHED;
-               else if (port->try_role == TYPEC_SOURCE)
-                       return SRC_UNATTACHED;
-               else if (port->tcpc->config->default_role == TYPEC_SINK)
-                       return SNK_UNATTACHED;
-               /* Fall through to return SRC_UNATTACHED */
-       } else if (port->port_type == TYPEC_PORT_SNK) {
-               return SNK_UNATTACHED;
-       }
-       return SRC_UNATTACHED;
-}
-
-static inline
-struct tcpm_port *typec_cap_to_tcpm(const struct typec_capability *cap)
-{
-       return container_of(cap, struct tcpm_port, typec_caps);
-}
-
-static bool tcpm_port_is_disconnected(struct tcpm_port *port)
-{
-       return (!port->attached && port->cc1 == TYPEC_CC_OPEN &&
-               port->cc2 == TYPEC_CC_OPEN) ||
-              (port->attached && ((port->polarity == TYPEC_POLARITY_CC1 &&
-                                   port->cc1 == TYPEC_CC_OPEN) ||
-                                  (port->polarity == TYPEC_POLARITY_CC2 &&
-                                   port->cc2 == TYPEC_CC_OPEN)));
-}
-
-/*
- * Logging
- */
-
-#ifdef CONFIG_DEBUG_FS
-
-static bool tcpm_log_full(struct tcpm_port *port)
-{
-       return port->logbuffer_tail ==
-               (port->logbuffer_head + 1) % LOG_BUFFER_ENTRIES;
-}
-
-__printf(2, 0)
-static void _tcpm_log(struct tcpm_port *port, const char *fmt, va_list args)
-{
-       char tmpbuffer[LOG_BUFFER_ENTRY_SIZE];
-       u64 ts_nsec = local_clock();
-       unsigned long rem_nsec;
-
-       mutex_lock(&port->logbuffer_lock);
-       if (!port->logbuffer[port->logbuffer_head]) {
-               port->logbuffer[port->logbuffer_head] =
-                               kzalloc(LOG_BUFFER_ENTRY_SIZE, GFP_KERNEL);
-               if (!port->logbuffer[port->logbuffer_head]) {
-                       mutex_unlock(&port->logbuffer_lock);
-                       return;
-               }
-       }
-
-       vsnprintf(tmpbuffer, sizeof(tmpbuffer), fmt, args);
-
-       if (tcpm_log_full(port)) {
-               port->logbuffer_head = max(port->logbuffer_head - 1, 0);
-               strcpy(tmpbuffer, "overflow");
-       }
-
-       if (port->logbuffer_head < 0 ||
-           port->logbuffer_head >= LOG_BUFFER_ENTRIES) {
-               dev_warn(port->dev,
-                        "Bad log buffer index %d\n", port->logbuffer_head);
-               goto abort;
-       }
-
-       if (!port->logbuffer[port->logbuffer_head]) {
-               dev_warn(port->dev,
-                        "Log buffer index %d is NULL\n", port->logbuffer_head);
-               goto abort;
-       }
-
-       rem_nsec = do_div(ts_nsec, 1000000000);
-       scnprintf(port->logbuffer[port->logbuffer_head],
-                 LOG_BUFFER_ENTRY_SIZE, "[%5lu.%06lu] %s",
-                 (unsigned long)ts_nsec, rem_nsec / 1000,
-                 tmpbuffer);
-       port->logbuffer_head = (port->logbuffer_head + 1) % LOG_BUFFER_ENTRIES;
-
-abort:
-       mutex_unlock(&port->logbuffer_lock);
-}
-
-__printf(2, 3)
-static void tcpm_log(struct tcpm_port *port, const char *fmt, ...)
-{
-       va_list args;
-
-       /* Do not log while disconnected and unattached */
-       if (tcpm_port_is_disconnected(port) &&
-           (port->state == SRC_UNATTACHED || port->state == SNK_UNATTACHED ||
-            port->state == DRP_TOGGLING))
-               return;
-
-       va_start(args, fmt);
-       _tcpm_log(port, fmt, args);
-       va_end(args);
-}
-
-__printf(2, 3)
-static void tcpm_log_force(struct tcpm_port *port, const char *fmt, ...)
-{
-       va_list args;
-
-       va_start(args, fmt);
-       _tcpm_log(port, fmt, args);
-       va_end(args);
-}
-
-static void tcpm_log_source_caps(struct tcpm_port *port)
-{
-       int i;
-
-       for (i = 0; i < port->nr_source_caps; i++) {
-               u32 pdo = port->source_caps[i];
-               enum pd_pdo_type type = pdo_type(pdo);
-               char msg[64];
-
-               switch (type) {
-               case PDO_TYPE_FIXED:
-                       scnprintf(msg, sizeof(msg),
-                                 "%u mV, %u mA [%s%s%s%s%s%s]",
-                                 pdo_fixed_voltage(pdo),
-                                 pdo_max_current(pdo),
-                                 (pdo & PDO_FIXED_DUAL_ROLE) ?
-                                                       "R" : "",
-                                 (pdo & PDO_FIXED_SUSPEND) ?
-                                                       "S" : "",
-                                 (pdo & PDO_FIXED_HIGHER_CAP) ?
-                                                       "H" : "",
-                                 (pdo & PDO_FIXED_USB_COMM) ?
-                                                       "U" : "",
-                                 (pdo & PDO_FIXED_DATA_SWAP) ?
-                                                       "D" : "",
-                                 (pdo & PDO_FIXED_EXTPOWER) ?
-                                                       "E" : "");
-                       break;
-               case PDO_TYPE_VAR:
-                       scnprintf(msg, sizeof(msg),
-                                 "%u-%u mV, %u mA",
-                                 pdo_min_voltage(pdo),
-                                 pdo_max_voltage(pdo),
-                                 pdo_max_current(pdo));
-                       break;
-               case PDO_TYPE_BATT:
-                       scnprintf(msg, sizeof(msg),
-                                 "%u-%u mV, %u mW",
-                                 pdo_min_voltage(pdo),
-                                 pdo_max_voltage(pdo),
-                                 pdo_max_power(pdo));
-                       break;
-               case PDO_TYPE_APDO:
-                       if (pdo_apdo_type(pdo) == APDO_TYPE_PPS)
-                               scnprintf(msg, sizeof(msg),
-                                         "%u-%u mV, %u mA",
-                                         pdo_pps_apdo_min_voltage(pdo),
-                                         pdo_pps_apdo_max_voltage(pdo),
-                                         pdo_pps_apdo_max_current(pdo));
-                       else
-                               strcpy(msg, "undefined APDO");
-                       break;
-               default:
-                       strcpy(msg, "undefined");
-                       break;
-               }
-               tcpm_log(port, " PDO %d: type %d, %s",
-                        i, type, msg);
-       }
-}
-
-static int tcpm_debug_show(struct seq_file *s, void *v)
-{
-       struct tcpm_port *port = (struct tcpm_port *)s->private;
-       int tail;
-
-       mutex_lock(&port->logbuffer_lock);
-       tail = port->logbuffer_tail;
-       while (tail != port->logbuffer_head) {
-               seq_printf(s, "%s\n", port->logbuffer[tail]);
-               tail = (tail + 1) % LOG_BUFFER_ENTRIES;
-       }
-       if (!seq_has_overflowed(s))
-               port->logbuffer_tail = tail;
-       mutex_unlock(&port->logbuffer_lock);
-
-       return 0;
-}
-DEFINE_SHOW_ATTRIBUTE(tcpm_debug);
-
-static struct dentry *rootdir;
-
-static void tcpm_debugfs_init(struct tcpm_port *port)
-{
-       mutex_init(&port->logbuffer_lock);
-       /* /sys/kernel/debug/tcpm/usbcX */
-       if (!rootdir)
-               rootdir = debugfs_create_dir("tcpm", NULL);
-
-       port->dentry = debugfs_create_file(dev_name(port->dev),
-                                          S_IFREG | 0444, rootdir,
-                                          port, &tcpm_debug_fops);
-}
-
-static void tcpm_debugfs_exit(struct tcpm_port *port)
-{
-       debugfs_remove(port->dentry);
-}
-
-#else
-
-__printf(2, 3)
-static void tcpm_log(const struct tcpm_port *port, const char *fmt, ...) { }
-__printf(2, 3)
-static void tcpm_log_force(struct tcpm_port *port, const char *fmt, ...) { }
-static void tcpm_log_source_caps(struct tcpm_port *port) { }
-static void tcpm_debugfs_init(const struct tcpm_port *port) { }
-static void tcpm_debugfs_exit(const struct tcpm_port *port) { }
-
-#endif
-
-static int tcpm_pd_transmit(struct tcpm_port *port,
-                           enum tcpm_transmit_type type,
-                           const struct pd_message *msg)
-{
-       unsigned long timeout;
-       int ret;
-
-       if (msg)
-               tcpm_log(port, "PD TX, header: %#x", le16_to_cpu(msg->header));
-       else
-               tcpm_log(port, "PD TX, type: %#x", type);
-
-       reinit_completion(&port->tx_complete);
-       ret = port->tcpc->pd_transmit(port->tcpc, type, msg);
-       if (ret < 0)
-               return ret;
-
-       mutex_unlock(&port->lock);
-       timeout = wait_for_completion_timeout(&port->tx_complete,
-                               msecs_to_jiffies(PD_T_TCPC_TX_TIMEOUT));
-       mutex_lock(&port->lock);
-       if (!timeout)
-               return -ETIMEDOUT;
-
-       switch (port->tx_status) {
-       case TCPC_TX_SUCCESS:
-               port->message_id = (port->message_id + 1) & PD_HEADER_ID_MASK;
-               return 0;
-       case TCPC_TX_DISCARDED:
-               return -EAGAIN;
-       case TCPC_TX_FAILED:
-       default:
-               return -EIO;
-       }
-}
-
-void tcpm_pd_transmit_complete(struct tcpm_port *port,
-                              enum tcpm_transmit_status status)
-{
-       tcpm_log(port, "PD TX complete, status: %u", status);
-       port->tx_status = status;
-       complete(&port->tx_complete);
-}
-EXPORT_SYMBOL_GPL(tcpm_pd_transmit_complete);
-
-static int tcpm_mux_set(struct tcpm_port *port, int state,
-                       enum usb_role usb_role,
-                       enum typec_orientation orientation)
-{
-       int ret;
-
-       tcpm_log(port, "Requesting mux state %d, usb-role %d, orientation %d",
-                state, usb_role, orientation);
-
-       ret = typec_set_orientation(port->typec_port, orientation);
-       if (ret)
-               return ret;
-
-       if (port->role_sw) {
-               ret = usb_role_switch_set_role(port->role_sw, usb_role);
-               if (ret)
-                       return ret;
-       }
-
-       return typec_set_mode(port->typec_port, state);
-}
-
-static int tcpm_set_polarity(struct tcpm_port *port,
-                            enum typec_cc_polarity polarity)
-{
-       int ret;
-
-       tcpm_log(port, "polarity %d", polarity);
-
-       ret = port->tcpc->set_polarity(port->tcpc, polarity);
-       if (ret < 0)
-               return ret;
-
-       port->polarity = polarity;
-
-       return 0;
-}
-
-static int tcpm_set_vconn(struct tcpm_port *port, bool enable)
-{
-       int ret;
-
-       tcpm_log(port, "vconn:=%d", enable);
-
-       ret = port->tcpc->set_vconn(port->tcpc, enable);
-       if (!ret) {
-               port->vconn_role = enable ? TYPEC_SOURCE : TYPEC_SINK;
-               typec_set_vconn_role(port->typec_port, port->vconn_role);
-       }
-
-       return ret;
-}
-
-static u32 tcpm_get_current_limit(struct tcpm_port *port)
-{
-       enum typec_cc_status cc;
-       u32 limit;
-
-       cc = port->polarity ? port->cc2 : port->cc1;
-       switch (cc) {
-       case TYPEC_CC_RP_1_5:
-               limit = 1500;
-               break;
-       case TYPEC_CC_RP_3_0:
-               limit = 3000;
-               break;
-       case TYPEC_CC_RP_DEF:
-       default:
-               if (port->tcpc->get_current_limit)
-                       limit = port->tcpc->get_current_limit(port->tcpc);
-               else
-                       limit = 0;
-               break;
-       }
-
-       return limit;
-}
-
-static int tcpm_set_current_limit(struct tcpm_port *port, u32 max_ma, u32 mv)
-{
-       int ret = -EOPNOTSUPP;
-
-       tcpm_log(port, "Setting voltage/current limit %u mV %u mA", mv, max_ma);
-
-       port->supply_voltage = mv;
-       port->current_limit = max_ma;
-
-       if (port->tcpc->set_current_limit)
-               ret = port->tcpc->set_current_limit(port->tcpc, max_ma, mv);
-
-       return ret;
-}
-
-/*
- * Determine RP value to set based on maximum current supported
- * by a port if configured as source.
- * Returns CC value to report to link partner.
- */
-static enum typec_cc_status tcpm_rp_cc(struct tcpm_port *port)
-{
-       const u32 *src_pdo = port->src_pdo;
-       int nr_pdo = port->nr_src_pdo;
-       int i;
-
-       /*
-        * Search for first entry with matching voltage.
-        * It should report the maximum supported current.
-        */
-       for (i = 0; i < nr_pdo; i++) {
-               const u32 pdo = src_pdo[i];
-
-               if (pdo_type(pdo) == PDO_TYPE_FIXED &&
-                   pdo_fixed_voltage(pdo) == 5000) {
-                       unsigned int curr = pdo_max_current(pdo);
-
-                       if (curr >= 3000)
-                               return TYPEC_CC_RP_3_0;
-                       else if (curr >= 1500)
-                               return TYPEC_CC_RP_1_5;
-                       return TYPEC_CC_RP_DEF;
-               }
-       }
-
-       return TYPEC_CC_RP_DEF;
-}
-
-static int tcpm_set_attached_state(struct tcpm_port *port, bool attached)
-{
-       return port->tcpc->set_roles(port->tcpc, attached, port->pwr_role,
-                                    port->data_role);
-}
-
-static int tcpm_set_roles(struct tcpm_port *port, bool attached,
-                         enum typec_role role, enum typec_data_role data)
-{
-       enum typec_orientation orientation;
-       enum usb_role usb_role;
-       int ret;
-
-       if (port->polarity == TYPEC_POLARITY_CC1)
-               orientation = TYPEC_ORIENTATION_NORMAL;
-       else
-               orientation = TYPEC_ORIENTATION_REVERSE;
-
-       if (data == TYPEC_HOST)
-               usb_role = USB_ROLE_HOST;
-       else
-               usb_role = USB_ROLE_DEVICE;
-
-       ret = tcpm_mux_set(port, TYPEC_STATE_USB, usb_role, orientation);
-       if (ret < 0)
-               return ret;
-
-       ret = port->tcpc->set_roles(port->tcpc, attached, role, data);
-       if (ret < 0)
-               return ret;
-
-       port->pwr_role = role;
-       port->data_role = data;
-       typec_set_data_role(port->typec_port, data);
-       typec_set_pwr_role(port->typec_port, role);
-
-       return 0;
-}
-
-static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role)
-{
-       int ret;
-
-       ret = port->tcpc->set_roles(port->tcpc, true, role,
-                                   port->data_role);
-       if (ret < 0)
-               return ret;
-
-       port->pwr_role = role;
-       typec_set_pwr_role(port->typec_port, role);
-
-       return 0;
-}
-
-static int tcpm_pd_send_source_caps(struct tcpm_port *port)
-{
-       struct pd_message msg;
-       int i;
-
-       memset(&msg, 0, sizeof(msg));
-       if (!port->nr_src_pdo) {
-               /* No source capabilities defined, sink only */
-               msg.header = PD_HEADER_LE(PD_CTRL_REJECT,
-                                         port->pwr_role,
-                                         port->data_role,
-                                         port->negotiated_rev,
-                                         port->message_id, 0);
-       } else {
-               msg.header = PD_HEADER_LE(PD_DATA_SOURCE_CAP,
-                                         port->pwr_role,
-                                         port->data_role,
-                                         port->negotiated_rev,
-                                         port->message_id,
-                                         port->nr_src_pdo);
-       }
-       for (i = 0; i < port->nr_src_pdo; i++)
-               msg.payload[i] = cpu_to_le32(port->src_pdo[i]);
-
-       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
-}
-
-static int tcpm_pd_send_sink_caps(struct tcpm_port *port)
-{
-       struct pd_message msg;
-       int i;
-
-       memset(&msg, 0, sizeof(msg));
-       if (!port->nr_snk_pdo) {
-               /* No sink capabilities defined, source only */
-               msg.header = PD_HEADER_LE(PD_CTRL_REJECT,
-                                         port->pwr_role,
-                                         port->data_role,
-                                         port->negotiated_rev,
-                                         port->message_id, 0);
-       } else {
-               msg.header = PD_HEADER_LE(PD_DATA_SINK_CAP,
-                                         port->pwr_role,
-                                         port->data_role,
-                                         port->negotiated_rev,
-                                         port->message_id,
-                                         port->nr_snk_pdo);
-       }
-       for (i = 0; i < port->nr_snk_pdo; i++)
-               msg.payload[i] = cpu_to_le32(port->snk_pdo[i]);
-
-       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
-}
-
-static void tcpm_set_state(struct tcpm_port *port, enum tcpm_state state,
-                          unsigned int delay_ms)
-{
-       if (delay_ms) {
-               tcpm_log(port, "pending state change %s -> %s @ %u ms",
-                        tcpm_states[port->state], tcpm_states[state],
-                        delay_ms);
-               port->delayed_state = state;
-               mod_delayed_work(port->wq, &port->state_machine,
-                                msecs_to_jiffies(delay_ms));
-               port->delayed_runtime = jiffies + msecs_to_jiffies(delay_ms);
-               port->delay_ms = delay_ms;
-       } else {
-               tcpm_log(port, "state change %s -> %s",
-                        tcpm_states[port->state], tcpm_states[state]);
-               port->delayed_state = INVALID_STATE;
-               port->prev_state = port->state;
-               port->state = state;
-               /*
-                * Don't re-queue the state machine work item if we're currently
-                * in the state machine and we're immediately changing states.
-                * tcpm_state_machine_work() will continue running the state
-                * machine.
-                */
-               if (!port->state_machine_running)
-                       mod_delayed_work(port->wq, &port->state_machine, 0);
-       }
-}
-
-static void tcpm_set_state_cond(struct tcpm_port *port, enum tcpm_state state,
-                               unsigned int delay_ms)
-{
-       if (port->enter_state == port->state)
-               tcpm_set_state(port, state, delay_ms);
-       else
-               tcpm_log(port,
-                        "skipped %sstate change %s -> %s [%u ms], context state %s",
-                        delay_ms ? "delayed " : "",
-                        tcpm_states[port->state], tcpm_states[state],
-                        delay_ms, tcpm_states[port->enter_state]);
-}
-
-static void tcpm_queue_message(struct tcpm_port *port,
-                              enum pd_msg_request message)
-{
-       port->queued_message = message;
-       mod_delayed_work(port->wq, &port->state_machine, 0);
-}
-
-/*
- * VDM/VDO handling functions
- */
-static void tcpm_queue_vdm(struct tcpm_port *port, const u32 header,
-                          const u32 *data, int cnt)
-{
-       port->vdo_count = cnt + 1;
-       port->vdo_data[0] = header;
-       memcpy(&port->vdo_data[1], data, sizeof(u32) * cnt);
-       /* Set ready, vdm state machine will actually send */
-       port->vdm_retries = 0;
-       port->vdm_state = VDM_STATE_READY;
-}
-
-static void svdm_consume_identity(struct tcpm_port *port, const __le32 *payload,
-                                 int cnt)
-{
-       u32 vdo = le32_to_cpu(payload[VDO_INDEX_IDH]);
-       u32 product = le32_to_cpu(payload[VDO_INDEX_PRODUCT]);
-
-       memset(&port->mode_data, 0, sizeof(port->mode_data));
-
-       port->partner_ident.id_header = vdo;
-       port->partner_ident.cert_stat = le32_to_cpu(payload[VDO_INDEX_CSTAT]);
-       port->partner_ident.product = product;
-
-       typec_partner_set_identity(port->partner);
-
-       tcpm_log(port, "Identity: %04x:%04x.%04x",
-                PD_IDH_VID(vdo),
-                PD_PRODUCT_PID(product), product & 0xffff);
-}
-
-static bool svdm_consume_svids(struct tcpm_port *port, const __le32 *payload,
-                              int cnt)
-{
-       struct pd_mode_data *pmdata = &port->mode_data;
-       int i;
-
-       for (i = 1; i < cnt; i++) {
-               u32 p = le32_to_cpu(payload[i]);
-               u16 svid;
-
-               svid = (p >> 16) & 0xffff;
-               if (!svid)
-                       return false;
-
-               if (pmdata->nsvids >= SVID_DISCOVERY_MAX)
-                       goto abort;
-
-               pmdata->svids[pmdata->nsvids++] = svid;
-               tcpm_log(port, "SVID %d: 0x%x", pmdata->nsvids, svid);
-
-               svid = p & 0xffff;
-               if (!svid)
-                       return false;
-
-               if (pmdata->nsvids >= SVID_DISCOVERY_MAX)
-                       goto abort;
-
-               pmdata->svids[pmdata->nsvids++] = svid;
-               tcpm_log(port, "SVID %d: 0x%x", pmdata->nsvids, svid);
-       }
-       return true;
-abort:
-       tcpm_log(port, "SVID_DISCOVERY_MAX(%d) too low!", SVID_DISCOVERY_MAX);
-       return false;
-}
-
-static void svdm_consume_modes(struct tcpm_port *port, const __le32 *payload,
-                              int cnt)
-{
-       struct pd_mode_data *pmdata = &port->mode_data;
-       struct typec_altmode_desc *paltmode;
-       int i;
-
-       if (pmdata->altmodes >= ARRAY_SIZE(port->partner_altmode)) {
-               /* Already logged in svdm_consume_svids() */
-               return;
-       }
-
-       for (i = 1; i < cnt; i++) {
-               paltmode = &pmdata->altmode_desc[pmdata->altmodes];
-               memset(paltmode, 0, sizeof(*paltmode));
-
-               paltmode->svid = pmdata->svids[pmdata->svid_index];
-               paltmode->mode = i;
-               paltmode->vdo = le32_to_cpu(payload[i]);
-
-               tcpm_log(port, " Alternate mode %d: SVID 0x%04x, VDO %d: 0x%08x",
-                        pmdata->altmodes, paltmode->svid,
-                        paltmode->mode, paltmode->vdo);
-
-               pmdata->altmodes++;
-       }
-}
-
-static void tcpm_register_partner_altmodes(struct tcpm_port *port)
-{
-       struct pd_mode_data *modep = &port->mode_data;
-       struct typec_altmode *altmode;
-       int i;
-
-       for (i = 0; i < modep->altmodes; i++) {
-               altmode = typec_partner_register_altmode(port->partner,
-                                               &modep->altmode_desc[i]);
-               if (!altmode)
-                       tcpm_log(port, "Failed to register partner SVID 0x%04x",
-                                modep->altmode_desc[i].svid);
-               port->partner_altmode[i] = altmode;
-       }
-}
-
-#define supports_modal(port)   PD_IDH_MODAL_SUPP((port)->partner_ident.id_header)
-
-static int tcpm_pd_svdm(struct tcpm_port *port, const __le32 *payload, int cnt,
-                       u32 *response)
-{
-       struct typec_altmode *adev;
-       struct typec_altmode *pdev;
-       struct pd_mode_data *modep;
-       u32 p[PD_MAX_PAYLOAD];
-       int rlen = 0;
-       int cmd_type;
-       int cmd;
-       int i;
-
-       for (i = 0; i < cnt; i++)
-               p[i] = le32_to_cpu(payload[i]);
-
-       cmd_type = PD_VDO_CMDT(p[0]);
-       cmd = PD_VDO_CMD(p[0]);
-
-       tcpm_log(port, "Rx VDM cmd 0x%x type %d cmd %d len %d",
-                p[0], cmd_type, cmd, cnt);
-
-       modep = &port->mode_data;
-
-       adev = typec_match_altmode(port->port_altmode, ALTMODE_DISCOVERY_MAX,
-                                  PD_VDO_VID(p[0]), PD_VDO_OPOS(p[0]));
-
-       pdev = typec_match_altmode(port->partner_altmode, ALTMODE_DISCOVERY_MAX,
-                                  PD_VDO_VID(p[0]), PD_VDO_OPOS(p[0]));
-
-       switch (cmd_type) {
-       case CMDT_INIT:
-               switch (cmd) {
-               case CMD_DISCOVER_IDENT:
-                       /* 6.4.4.3.1: Only respond as UFP (device) */
-                       if (port->data_role == TYPEC_DEVICE &&
-                           port->nr_snk_vdo) {
-                               for (i = 0; i <  port->nr_snk_vdo; i++)
-                                       response[i + 1] = port->snk_vdo[i];
-                               rlen = port->nr_snk_vdo + 1;
-                       }
-                       break;
-               case CMD_DISCOVER_SVID:
-                       break;
-               case CMD_DISCOVER_MODES:
-                       break;
-               case CMD_ENTER_MODE:
-                       break;
-               case CMD_EXIT_MODE:
-                       break;
-               case CMD_ATTENTION:
-                       /* Attention command does not have response */
-                       typec_altmode_attention(adev, p[1]);
-                       return 0;
-               default:
-                       break;
-               }
-               if (rlen >= 1) {
-                       response[0] = p[0] | VDO_CMDT(CMDT_RSP_ACK);
-               } else if (rlen == 0) {
-                       response[0] = p[0] | VDO_CMDT(CMDT_RSP_NAK);
-                       rlen = 1;
-               } else {
-                       response[0] = p[0] | VDO_CMDT(CMDT_RSP_BUSY);
-                       rlen = 1;
-               }
-               break;
-       case CMDT_RSP_ACK:
-               /* silently drop message if we are not connected */
-               if (IS_ERR_OR_NULL(port->partner))
-                       break;
-
-               switch (cmd) {
-               case CMD_DISCOVER_IDENT:
-                       /* 6.4.4.3.1 */
-                       svdm_consume_identity(port, payload, cnt);
-                       response[0] = VDO(USB_SID_PD, 1, CMD_DISCOVER_SVID);
-                       rlen = 1;
-                       break;
-               case CMD_DISCOVER_SVID:
-                       /* 6.4.4.3.2 */
-                       if (svdm_consume_svids(port, payload, cnt)) {
-                               response[0] = VDO(USB_SID_PD, 1,
-                                                 CMD_DISCOVER_SVID);
-                               rlen = 1;
-                       } else if (modep->nsvids && supports_modal(port)) {
-                               response[0] = VDO(modep->svids[0], 1,
-                                                 CMD_DISCOVER_MODES);
-                               rlen = 1;
-                       }
-                       break;
-               case CMD_DISCOVER_MODES:
-                       /* 6.4.4.3.3 */
-                       svdm_consume_modes(port, payload, cnt);
-                       modep->svid_index++;
-                       if (modep->svid_index < modep->nsvids) {
-                               u16 svid = modep->svids[modep->svid_index];
-                               response[0] = VDO(svid, 1, CMD_DISCOVER_MODES);
-                               rlen = 1;
-                       } else {
-                               tcpm_register_partner_altmodes(port);
-                       }
-                       break;
-               case CMD_ENTER_MODE:
-                       typec_altmode_update_active(pdev, true);
-
-                       if (typec_altmode_vdm(adev, p[0], &p[1], cnt)) {
-                               response[0] = VDO(adev->svid, 1, CMD_EXIT_MODE);
-                               response[0] |= VDO_OPOS(adev->mode);
-                               return 1;
-                       }
-                       return 0;
-               case CMD_EXIT_MODE:
-                       typec_altmode_update_active(pdev, false);
-
-                       /* Back to USB Operation */
-                       WARN_ON(typec_altmode_notify(adev, TYPEC_STATE_USB,
-                                                    NULL));
-                       break;
-               default:
-                       break;
-               }
-               break;
-       case CMDT_RSP_NAK:
-               switch (cmd) {
-               case CMD_ENTER_MODE:
-                       /* Back to USB Operation */
-                       WARN_ON(typec_altmode_notify(adev, TYPEC_STATE_USB,
-                                                    NULL));
-                       break;
-               default:
-                       break;
-               }
-               break;
-       default:
-               break;
-       }
-
-       /* Informing the alternate mode drivers about everything */
-       typec_altmode_vdm(adev, p[0], &p[1], cnt);
-
-       return rlen;
-}
-
-static void tcpm_handle_vdm_request(struct tcpm_port *port,
-                                   const __le32 *payload, int cnt)
-{
-       int rlen = 0;
-       u32 response[8] = { };
-       u32 p0 = le32_to_cpu(payload[0]);
-
-       if (port->vdm_state == VDM_STATE_BUSY) {
-               /* If UFP responded busy retry after timeout */
-               if (PD_VDO_CMDT(p0) == CMDT_RSP_BUSY) {
-                       port->vdm_state = VDM_STATE_WAIT_RSP_BUSY;
-                       port->vdo_retry = (p0 & ~VDO_CMDT_MASK) |
-                               CMDT_INIT;
-                       mod_delayed_work(port->wq, &port->vdm_state_machine,
-                                        msecs_to_jiffies(PD_T_VDM_BUSY));
-                       return;
-               }
-               port->vdm_state = VDM_STATE_DONE;
-       }
-
-       if (PD_VDO_SVDM(p0))
-               rlen = tcpm_pd_svdm(port, payload, cnt, response);
-
-       if (rlen > 0) {
-               tcpm_queue_vdm(port, response[0], &response[1], rlen - 1);
-               mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
-       }
-}
-
-static void tcpm_send_vdm(struct tcpm_port *port, u32 vid, int cmd,
-                         const u32 *data, int count)
-{
-       u32 header;
-
-       if (WARN_ON(count > VDO_MAX_SIZE - 1))
-               count = VDO_MAX_SIZE - 1;
-
-       /* set VDM header with VID & CMD */
-       header = VDO(vid, ((vid & USB_SID_PD) == USB_SID_PD) ?
-                       1 : (PD_VDO_CMD(cmd) <= CMD_ATTENTION), cmd);
-       tcpm_queue_vdm(port, header, data, count);
-
-       mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
-}
-
-static unsigned int vdm_ready_timeout(u32 vdm_hdr)
-{
-       unsigned int timeout;
-       int cmd = PD_VDO_CMD(vdm_hdr);
-
-       /* its not a structured VDM command */
-       if (!PD_VDO_SVDM(vdm_hdr))
-               return PD_T_VDM_UNSTRUCTURED;
-
-       switch (PD_VDO_CMDT(vdm_hdr)) {
-       case CMDT_INIT:
-               if (cmd == CMD_ENTER_MODE || cmd == CMD_EXIT_MODE)
-                       timeout = PD_T_VDM_WAIT_MODE_E;
-               else
-                       timeout = PD_T_VDM_SNDR_RSP;
-               break;
-       default:
-               if (cmd == CMD_ENTER_MODE || cmd == CMD_EXIT_MODE)
-                       timeout = PD_T_VDM_E_MODE;
-               else
-                       timeout = PD_T_VDM_RCVR_RSP;
-               break;
-       }
-       return timeout;
-}
-
-static void vdm_run_state_machine(struct tcpm_port *port)
-{
-       struct pd_message msg;
-       int i, res;
-
-       switch (port->vdm_state) {
-       case VDM_STATE_READY:
-               /* Only transmit VDM if attached */
-               if (!port->attached) {
-                       port->vdm_state = VDM_STATE_ERR_BUSY;
-                       break;
-               }
-
-               /*
-                * if there's traffic or we're not in PDO ready state don't send
-                * a VDM.
-                */
-               if (port->state != SRC_READY && port->state != SNK_READY)
-                       break;
-
-               /* Prepare and send VDM */
-               memset(&msg, 0, sizeof(msg));
-               msg.header = PD_HEADER_LE(PD_DATA_VENDOR_DEF,
-                                         port->pwr_role,
-                                         port->data_role,
-                                         port->negotiated_rev,
-                                         port->message_id, port->vdo_count);
-               for (i = 0; i < port->vdo_count; i++)
-                       msg.payload[i] = cpu_to_le32(port->vdo_data[i]);
-               res = tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
-               if (res < 0) {
-                       port->vdm_state = VDM_STATE_ERR_SEND;
-               } else {
-                       unsigned long timeout;
-
-                       port->vdm_retries = 0;
-                       port->vdm_state = VDM_STATE_BUSY;
-                       timeout = vdm_ready_timeout(port->vdo_data[0]);
-                       mod_delayed_work(port->wq, &port->vdm_state_machine,
-                                        timeout);
-               }
-               break;
-       case VDM_STATE_WAIT_RSP_BUSY:
-               port->vdo_data[0] = port->vdo_retry;
-               port->vdo_count = 1;
-               port->vdm_state = VDM_STATE_READY;
-               break;
-       case VDM_STATE_BUSY:
-               port->vdm_state = VDM_STATE_ERR_TMOUT;
-               break;
-       case VDM_STATE_ERR_SEND:
-               /*
-                * A partner which does not support USB PD will not reply,
-                * so this is not a fatal error. At the same time, some
-                * devices may not return GoodCRC under some circumstances,
-                * so we need to retry.
-                */
-               if (port->vdm_retries < 3) {
-                       tcpm_log(port, "VDM Tx error, retry");
-                       port->vdm_retries++;
-                       port->vdm_state = VDM_STATE_READY;
-               }
-               break;
-       default:
-               break;
-       }
-}
-
-static void vdm_state_machine_work(struct work_struct *work)
-{
-       struct tcpm_port *port = container_of(work, struct tcpm_port,
-                                             vdm_state_machine.work);
-       enum vdm_states prev_state;
-
-       mutex_lock(&port->lock);
-
-       /*
-        * Continue running as long as the port is not busy and there was
-        * a state change.
-        */
-       do {
-               prev_state = port->vdm_state;
-               vdm_run_state_machine(port);
-       } while (port->vdm_state != prev_state &&
-                port->vdm_state != VDM_STATE_BUSY);
-
-       mutex_unlock(&port->lock);
-}
-
-enum pdo_err {
-       PDO_NO_ERR,
-       PDO_ERR_NO_VSAFE5V,
-       PDO_ERR_VSAFE5V_NOT_FIRST,
-       PDO_ERR_PDO_TYPE_NOT_IN_ORDER,
-       PDO_ERR_FIXED_NOT_SORTED,
-       PDO_ERR_VARIABLE_BATT_NOT_SORTED,
-       PDO_ERR_DUPE_PDO,
-       PDO_ERR_PPS_APDO_NOT_SORTED,
-       PDO_ERR_DUPE_PPS_APDO,
-};
-
-static const char * const pdo_err_msg[] = {
-       [PDO_ERR_NO_VSAFE5V] =
-       " err: source/sink caps should atleast have vSafe5V",
-       [PDO_ERR_VSAFE5V_NOT_FIRST] =
-       " err: vSafe5V Fixed Supply Object Shall always be the first object",
-       [PDO_ERR_PDO_TYPE_NOT_IN_ORDER] =
-       " err: PDOs should be in the following order: Fixed; Battery; Variable",
-       [PDO_ERR_FIXED_NOT_SORTED] =
-       " err: Fixed supply pdos should be in increasing order of their fixed voltage",
-       [PDO_ERR_VARIABLE_BATT_NOT_SORTED] =
-       " err: Variable/Battery supply pdos should be in increasing order of their minimum voltage",
-       [PDO_ERR_DUPE_PDO] =
-       " err: Variable/Batt supply pdos cannot have same min/max voltage",
-       [PDO_ERR_PPS_APDO_NOT_SORTED] =
-       " err: Programmable power supply apdos should be in increasing order of their maximum voltage",
-       [PDO_ERR_DUPE_PPS_APDO] =
-       " err: Programmable power supply apdos cannot have same min/max voltage and max current",
-};
-
-static enum pdo_err tcpm_caps_err(struct tcpm_port *port, const u32 *pdo,
-                                 unsigned int nr_pdo)
-{
-       unsigned int i;
-
-       /* Should at least contain vSafe5v */
-       if (nr_pdo < 1)
-               return PDO_ERR_NO_VSAFE5V;
-
-       /* The vSafe5V Fixed Supply Object Shall always be the first object */
-       if (pdo_type(pdo[0]) != PDO_TYPE_FIXED ||
-           pdo_fixed_voltage(pdo[0]) != VSAFE5V)
-               return PDO_ERR_VSAFE5V_NOT_FIRST;
-
-       for (i = 1; i < nr_pdo; i++) {
-               if (pdo_type(pdo[i]) < pdo_type(pdo[i - 1])) {
-                       return PDO_ERR_PDO_TYPE_NOT_IN_ORDER;
-               } else if (pdo_type(pdo[i]) == pdo_type(pdo[i - 1])) {
-                       enum pd_pdo_type type = pdo_type(pdo[i]);
-
-                       switch (type) {
-                       /*
-                        * The remaining Fixed Supply Objects, if
-                        * present, shall be sent in voltage order;
-                        * lowest to highest.
-                        */
-                       case PDO_TYPE_FIXED:
-                               if (pdo_fixed_voltage(pdo[i]) <=
-                                   pdo_fixed_voltage(pdo[i - 1]))
-                                       return PDO_ERR_FIXED_NOT_SORTED;
-                               break;
-                       /*
-                        * The Battery Supply Objects and Variable
-                        * supply, if present shall be sent in Minimum
-                        * Voltage order; lowest to highest.
-                        */
-                       case PDO_TYPE_VAR:
-                       case PDO_TYPE_BATT:
-                               if (pdo_min_voltage(pdo[i]) <
-                                   pdo_min_voltage(pdo[i - 1]))
-                                       return PDO_ERR_VARIABLE_BATT_NOT_SORTED;
-                               else if ((pdo_min_voltage(pdo[i]) ==
-                                         pdo_min_voltage(pdo[i - 1])) &&
-                                        (pdo_max_voltage(pdo[i]) ==
-                                         pdo_min_voltage(pdo[i - 1])))
-                                       return PDO_ERR_DUPE_PDO;
-                               break;
-                       /*
-                        * The Programmable Power Supply APDOs, if present,
-                        * shall be sent in Maximum Voltage order;
-                        * lowest to highest.
-                        */
-                       case PDO_TYPE_APDO:
-                               if (pdo_apdo_type(pdo[i]) != APDO_TYPE_PPS)
-                                       break;
-
-                               if (pdo_pps_apdo_max_current(pdo[i]) <
-                                   pdo_pps_apdo_max_current(pdo[i - 1]))
-                                       return PDO_ERR_PPS_APDO_NOT_SORTED;
-                               else if (pdo_pps_apdo_min_voltage(pdo[i]) ==
-                                         pdo_pps_apdo_min_voltage(pdo[i - 1]) &&
-                                        pdo_pps_apdo_max_voltage(pdo[i]) ==
-                                         pdo_pps_apdo_max_voltage(pdo[i - 1]) &&
-                                        pdo_pps_apdo_max_current(pdo[i]) ==
-                                         pdo_pps_apdo_max_current(pdo[i - 1]))
-                                       return PDO_ERR_DUPE_PPS_APDO;
-                               break;
-                       default:
-                               tcpm_log_force(port, " Unknown pdo type");
-                       }
-               }
-       }
-
-       return PDO_NO_ERR;
-}
-
-static int tcpm_validate_caps(struct tcpm_port *port, const u32 *pdo,
-                             unsigned int nr_pdo)
-{
-       enum pdo_err err_index = tcpm_caps_err(port, pdo, nr_pdo);
-
-       if (err_index != PDO_NO_ERR) {
-               tcpm_log_force(port, " %s", pdo_err_msg[err_index]);
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static int tcpm_altmode_enter(struct typec_altmode *altmode)
-{
-       struct tcpm_port *port = typec_altmode_get_drvdata(altmode);
-       u32 header;
-
-       mutex_lock(&port->lock);
-       header = VDO(altmode->svid, 1, CMD_ENTER_MODE);
-       header |= VDO_OPOS(altmode->mode);
-
-       tcpm_queue_vdm(port, header, NULL, 0);
-       mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
-       mutex_unlock(&port->lock);
-
-       return 0;
-}
-
-static int tcpm_altmode_exit(struct typec_altmode *altmode)
-{
-       struct tcpm_port *port = typec_altmode_get_drvdata(altmode);
-       u32 header;
-
-       mutex_lock(&port->lock);
-       header = VDO(altmode->svid, 1, CMD_EXIT_MODE);
-       header |= VDO_OPOS(altmode->mode);
-
-       tcpm_queue_vdm(port, header, NULL, 0);
-       mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
-       mutex_unlock(&port->lock);
-
-       return 0;
-}
-
-static int tcpm_altmode_vdm(struct typec_altmode *altmode,
-                           u32 header, const u32 *data, int count)
-{
-       struct tcpm_port *port = typec_altmode_get_drvdata(altmode);
-
-       mutex_lock(&port->lock);
-       tcpm_queue_vdm(port, header, data, count - 1);
-       mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
-       mutex_unlock(&port->lock);
-
-       return 0;
-}
-
-static const struct typec_altmode_ops tcpm_altmode_ops = {
-       .enter = tcpm_altmode_enter,
-       .exit = tcpm_altmode_exit,
-       .vdm = tcpm_altmode_vdm,
-};
-
-/*
- * PD (data, control) command handling functions
- */
-static inline enum tcpm_state ready_state(struct tcpm_port *port)
-{
-       if (port->pwr_role == TYPEC_SOURCE)
-               return SRC_READY;
-       else
-               return SNK_READY;
-}
-
-static int tcpm_pd_send_control(struct tcpm_port *port,
-                               enum pd_ctrl_msg_type type);
-
-static void tcpm_handle_alert(struct tcpm_port *port, const __le32 *payload,
-                             int cnt)
-{
-       u32 p0 = le32_to_cpu(payload[0]);
-       unsigned int type = usb_pd_ado_type(p0);
-
-       if (!type) {
-               tcpm_log(port, "Alert message received with no type");
-               return;
-       }
-
-       /* Just handling non-battery alerts for now */
-       if (!(type & USB_PD_ADO_TYPE_BATT_STATUS_CHANGE)) {
-               switch (port->state) {
-               case SRC_READY:
-               case SNK_READY:
-                       tcpm_set_state(port, GET_STATUS_SEND, 0);
-                       break;
-               default:
-                       tcpm_queue_message(port, PD_MSG_CTRL_WAIT);
-                       break;
-               }
-       }
-}
-
-static void tcpm_pd_data_request(struct tcpm_port *port,
-                                const struct pd_message *msg)
-{
-       enum pd_data_msg_type type = pd_header_type_le(msg->header);
-       unsigned int cnt = pd_header_cnt_le(msg->header);
-       unsigned int rev = pd_header_rev_le(msg->header);
-       unsigned int i;
-
-       switch (type) {
-       case PD_DATA_SOURCE_CAP:
-               if (port->pwr_role != TYPEC_SINK)
-                       break;
-
-               for (i = 0; i < cnt; i++)
-                       port->source_caps[i] = le32_to_cpu(msg->payload[i]);
-
-               port->nr_source_caps = cnt;
-
-               tcpm_log_source_caps(port);
-
-               tcpm_validate_caps(port, port->source_caps,
-                                  port->nr_source_caps);
-
-               /*
-                * Adjust revision in subsequent message headers, as required,
-                * to comply with 6.2.1.1.5 of the USB PD 3.0 spec. We don't
-                * support Rev 1.0 so just do nothing in that scenario.
-                */
-               if (rev == PD_REV10)
-                       break;
-
-               if (rev < PD_MAX_REV)
-                       port->negotiated_rev = rev;
-
-               /*
-                * This message may be received even if VBUS is not
-                * present. This is quite unexpected; see USB PD
-                * specification, sections 8.3.3.6.3.1 and 8.3.3.6.3.2.
-                * However, at the same time, we must be ready to
-                * receive this message and respond to it 15ms after
-                * receiving PS_RDY during power swap operations, no matter
-                * if VBUS is available or not (USB PD specification,
-                * section 6.5.9.2).
-                * So we need to accept the message either way,
-                * but be prepared to keep waiting for VBUS after it was
-                * handled.
-                */
-               tcpm_set_state(port, SNK_NEGOTIATE_CAPABILITIES, 0);
-               break;
-       case PD_DATA_REQUEST:
-               if (port->pwr_role != TYPEC_SOURCE ||
-                   cnt != 1) {
-                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
-                       break;
-               }
-
-               /*
-                * Adjust revision in subsequent message headers, as required,
-                * to comply with 6.2.1.1.5 of the USB PD 3.0 spec. We don't
-                * support Rev 1.0 so just reject in that scenario.
-                */
-               if (rev == PD_REV10) {
-                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
-                       break;
-               }
-
-               if (rev < PD_MAX_REV)
-                       port->negotiated_rev = rev;
-
-               port->sink_request = le32_to_cpu(msg->payload[0]);
-               tcpm_set_state(port, SRC_NEGOTIATE_CAPABILITIES, 0);
-               break;
-       case PD_DATA_SINK_CAP:
-               /* We don't do anything with this at the moment... */
-               for (i = 0; i < cnt; i++)
-                       port->sink_caps[i] = le32_to_cpu(msg->payload[i]);
-               port->nr_sink_caps = cnt;
-               break;
-       case PD_DATA_VENDOR_DEF:
-               tcpm_handle_vdm_request(port, msg->payload, cnt);
-               break;
-       case PD_DATA_BIST:
-               if (port->state == SRC_READY || port->state == SNK_READY) {
-                       port->bist_request = le32_to_cpu(msg->payload[0]);
-                       tcpm_set_state(port, BIST_RX, 0);
-               }
-               break;
-       case PD_DATA_ALERT:
-               tcpm_handle_alert(port, msg->payload, cnt);
-               break;
-       case PD_DATA_BATT_STATUS:
-       case PD_DATA_GET_COUNTRY_INFO:
-               /* Currently unsupported */
-               tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP);
-               break;
-       default:
-               tcpm_log(port, "Unhandled data message type %#x", type);
-               break;
-       }
-}
-
-static void tcpm_pps_complete(struct tcpm_port *port, int result)
-{
-       if (port->pps_pending) {
-               port->pps_status = result;
-               port->pps_pending = false;
-               complete(&port->pps_complete);
-       }
-}
-
-static void tcpm_pd_ctrl_request(struct tcpm_port *port,
-                                const struct pd_message *msg)
-{
-       enum pd_ctrl_msg_type type = pd_header_type_le(msg->header);
-       enum tcpm_state next_state;
-
-       switch (type) {
-       case PD_CTRL_GOOD_CRC:
-       case PD_CTRL_PING:
-               break;
-       case PD_CTRL_GET_SOURCE_CAP:
-               switch (port->state) {
-               case SRC_READY:
-               case SNK_READY:
-                       tcpm_queue_message(port, PD_MSG_DATA_SOURCE_CAP);
-                       break;
-               default:
-                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
-                       break;
-               }
-               break;
-       case PD_CTRL_GET_SINK_CAP:
-               switch (port->state) {
-               case SRC_READY:
-               case SNK_READY:
-                       tcpm_queue_message(port, PD_MSG_DATA_SINK_CAP);
-                       break;
-               default:
-                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
-                       break;
-               }
-               break;
-       case PD_CTRL_GOTO_MIN:
-               break;
-       case PD_CTRL_PS_RDY:
-               switch (port->state) {
-               case SNK_TRANSITION_SINK:
-                       if (port->vbus_present) {
-                               tcpm_set_current_limit(port,
-                                                      port->current_limit,
-                                                      port->supply_voltage);
-                               port->explicit_contract = true;
-                               tcpm_set_state(port, SNK_READY, 0);
-                       } else {
-                               /*
-                                * Seen after power swap. Keep waiting for VBUS
-                                * in a transitional state.
-                                */
-                               tcpm_set_state(port,
-                                              SNK_TRANSITION_SINK_VBUS, 0);
-                       }
-                       break;
-               case PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED:
-                       tcpm_set_state(port, PR_SWAP_SRC_SNK_SINK_ON, 0);
-                       break;
-               case PR_SWAP_SNK_SRC_SINK_OFF:
-                       tcpm_set_state(port, PR_SWAP_SNK_SRC_SOURCE_ON, 0);
-                       break;
-               case VCONN_SWAP_WAIT_FOR_VCONN:
-                       tcpm_set_state(port, VCONN_SWAP_TURN_OFF_VCONN, 0);
-                       break;
-               default:
-                       break;
-               }
-               break;
-       case PD_CTRL_REJECT:
-       case PD_CTRL_WAIT:
-       case PD_CTRL_NOT_SUPP:
-               switch (port->state) {
-               case SNK_NEGOTIATE_CAPABILITIES:
-                       /* USB PD specification, Figure 8-43 */
-                       if (port->explicit_contract)
-                               next_state = SNK_READY;
-                       else
-                               next_state = SNK_WAIT_CAPABILITIES;
-                       tcpm_set_state(port, next_state, 0);
-                       break;
-               case SNK_NEGOTIATE_PPS_CAPABILITIES:
-                       /* Revert data back from any requested PPS updates */
-                       port->pps_data.out_volt = port->supply_voltage;
-                       port->pps_data.op_curr = port->current_limit;
-                       port->pps_status = (type == PD_CTRL_WAIT ?
-                                           -EAGAIN : -EOPNOTSUPP);
-                       tcpm_set_state(port, SNK_READY, 0);
-                       break;
-               case DR_SWAP_SEND:
-                       port->swap_status = (type == PD_CTRL_WAIT ?
-                                            -EAGAIN : -EOPNOTSUPP);
-                       tcpm_set_state(port, DR_SWAP_CANCEL, 0);
-                       break;
-               case PR_SWAP_SEND:
-                       port->swap_status = (type == PD_CTRL_WAIT ?
-                                            -EAGAIN : -EOPNOTSUPP);
-                       tcpm_set_state(port, PR_SWAP_CANCEL, 0);
-                       break;
-               case VCONN_SWAP_SEND:
-                       port->swap_status = (type == PD_CTRL_WAIT ?
-                                            -EAGAIN : -EOPNOTSUPP);
-                       tcpm_set_state(port, VCONN_SWAP_CANCEL, 0);
-                       break;
-               default:
-                       break;
-               }
-               break;
-       case PD_CTRL_ACCEPT:
-               switch (port->state) {
-               case SNK_NEGOTIATE_CAPABILITIES:
-                       port->pps_data.active = false;
-                       tcpm_set_state(port, SNK_TRANSITION_SINK, 0);
-                       break;
-               case SNK_NEGOTIATE_PPS_CAPABILITIES:
-                       port->pps_data.active = true;
-                       port->supply_voltage = port->pps_data.out_volt;
-                       port->current_limit = port->pps_data.op_curr;
-                       tcpm_set_state(port, SNK_TRANSITION_SINK, 0);
-                       break;
-               case SOFT_RESET_SEND:
-                       port->message_id = 0;
-                       port->rx_msgid = -1;
-                       if (port->pwr_role == TYPEC_SOURCE)
-                               next_state = SRC_SEND_CAPABILITIES;
-                       else
-                               next_state = SNK_WAIT_CAPABILITIES;
-                       tcpm_set_state(port, next_state, 0);
-                       break;
-               case DR_SWAP_SEND:
-                       tcpm_set_state(port, DR_SWAP_CHANGE_DR, 0);
-                       break;
-               case PR_SWAP_SEND:
-                       tcpm_set_state(port, PR_SWAP_START, 0);
-                       break;
-               case VCONN_SWAP_SEND:
-                       tcpm_set_state(port, VCONN_SWAP_START, 0);
-                       break;
-               default:
-                       break;
-               }
-               break;
-       case PD_CTRL_SOFT_RESET:
-               tcpm_set_state(port, SOFT_RESET, 0);
-               break;
-       case PD_CTRL_DR_SWAP:
-               if (port->port_type != TYPEC_PORT_DRP) {
-                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
-                       break;
-               }
-               /*
-                * XXX
-                * 6.3.9: If an alternate mode is active, a request to swap
-                * alternate modes shall trigger a port reset.
-                */
-               switch (port->state) {
-               case SRC_READY:
-               case SNK_READY:
-                       tcpm_set_state(port, DR_SWAP_ACCEPT, 0);
-                       break;
-               default:
-                       tcpm_queue_message(port, PD_MSG_CTRL_WAIT);
-                       break;
-               }
-               break;
-       case PD_CTRL_PR_SWAP:
-               if (port->port_type != TYPEC_PORT_DRP) {
-                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
-                       break;
-               }
-               switch (port->state) {
-               case SRC_READY:
-               case SNK_READY:
-                       tcpm_set_state(port, PR_SWAP_ACCEPT, 0);
-                       break;
-               default:
-                       tcpm_queue_message(port, PD_MSG_CTRL_WAIT);
-                       break;
-               }
-               break;
-       case PD_CTRL_VCONN_SWAP:
-               switch (port->state) {
-               case SRC_READY:
-               case SNK_READY:
-                       tcpm_set_state(port, VCONN_SWAP_ACCEPT, 0);
-                       break;
-               default:
-                       tcpm_queue_message(port, PD_MSG_CTRL_WAIT);
-                       break;
-               }
-               break;
-       case PD_CTRL_GET_SOURCE_CAP_EXT:
-       case PD_CTRL_GET_STATUS:
-       case PD_CTRL_FR_SWAP:
-       case PD_CTRL_GET_PPS_STATUS:
-       case PD_CTRL_GET_COUNTRY_CODES:
-               /* Currently not supported */
-               tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP);
-               break;
-       default:
-               tcpm_log(port, "Unhandled ctrl message type %#x", type);
-               break;
-       }
-}
-
-static void tcpm_pd_ext_msg_request(struct tcpm_port *port,
-                                   const struct pd_message *msg)
-{
-       enum pd_ext_msg_type type = pd_header_type_le(msg->header);
-       unsigned int data_size = pd_ext_header_data_size_le(msg->ext_msg.header);
-
-       if (!(msg->ext_msg.header & PD_EXT_HDR_CHUNKED)) {
-               tcpm_log(port, "Unchunked extended messages unsupported");
-               return;
-       }
-
-       if (data_size > PD_EXT_MAX_CHUNK_DATA) {
-               tcpm_log(port, "Chunk handling not yet supported");
-               return;
-       }
-
-       switch (type) {
-       case PD_EXT_STATUS:
-               /*
-                * If PPS related events raised then get PPS status to clear
-                * (see USB PD 3.0 Spec, 6.5.2.4)
-                */
-               if (msg->ext_msg.data[USB_PD_EXT_SDB_EVENT_FLAGS] &
-                   USB_PD_EXT_SDB_PPS_EVENTS)
-                       tcpm_set_state(port, GET_PPS_STATUS_SEND, 0);
-               else
-                       tcpm_set_state(port, ready_state(port), 0);
-               break;
-       case PD_EXT_PPS_STATUS:
-               /*
-                * For now the PPS status message is used to clear events
-                * and nothing more.
-                */
-               tcpm_set_state(port, ready_state(port), 0);
-               break;
-       case PD_EXT_SOURCE_CAP_EXT:
-       case PD_EXT_GET_BATT_CAP:
-       case PD_EXT_GET_BATT_STATUS:
-       case PD_EXT_BATT_CAP:
-       case PD_EXT_GET_MANUFACTURER_INFO:
-       case PD_EXT_MANUFACTURER_INFO:
-       case PD_EXT_SECURITY_REQUEST:
-       case PD_EXT_SECURITY_RESPONSE:
-       case PD_EXT_FW_UPDATE_REQUEST:
-       case PD_EXT_FW_UPDATE_RESPONSE:
-       case PD_EXT_COUNTRY_INFO:
-       case PD_EXT_COUNTRY_CODES:
-               tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP);
-               break;
-       default:
-               tcpm_log(port, "Unhandled extended message type %#x", type);
-               break;
-       }
-}
-
-static void tcpm_pd_rx_handler(struct work_struct *work)
-{
-       struct pd_rx_event *event = container_of(work,
-                                                struct pd_rx_event, work);
-       const struct pd_message *msg = &event->msg;
-       unsigned int cnt = pd_header_cnt_le(msg->header);
-       struct tcpm_port *port = event->port;
-
-       mutex_lock(&port->lock);
-
-       tcpm_log(port, "PD RX, header: %#x [%d]", le16_to_cpu(msg->header),
-                port->attached);
-
-       if (port->attached) {
-               enum pd_ctrl_msg_type type = pd_header_type_le(msg->header);
-               unsigned int msgid = pd_header_msgid_le(msg->header);
-
-               /*
-                * USB PD standard, 6.6.1.2:
-                * "... if MessageID value in a received Message is the
-                * same as the stored value, the receiver shall return a
-                * GoodCRC Message with that MessageID value and drop
-                * the Message (this is a retry of an already received
-                * Message). Note: this shall not apply to the Soft_Reset
-                * Message which always has a MessageID value of zero."
-                */
-               if (msgid == port->rx_msgid && type != PD_CTRL_SOFT_RESET)
-                       goto done;
-               port->rx_msgid = msgid;
-
-               /*
-                * If both ends believe to be DFP/host, we have a data role
-                * mismatch.
-                */
-               if (!!(le16_to_cpu(msg->header) & PD_HEADER_DATA_ROLE) ==
-                   (port->data_role == TYPEC_HOST)) {
-                       tcpm_log(port,
-                                "Data role mismatch, initiating error recovery");
-                       tcpm_set_state(port, ERROR_RECOVERY, 0);
-               } else {
-                       if (msg->header & PD_HEADER_EXT_HDR)
-                               tcpm_pd_ext_msg_request(port, msg);
-                       else if (cnt)
-                               tcpm_pd_data_request(port, msg);
-                       else
-                               tcpm_pd_ctrl_request(port, msg);
-               }
-       }
-
-done:
-       mutex_unlock(&port->lock);
-       kfree(event);
-}
-
-void tcpm_pd_receive(struct tcpm_port *port, const struct pd_message *msg)
-{
-       struct pd_rx_event *event;
-
-       event = kzalloc(sizeof(*event), GFP_ATOMIC);
-       if (!event)
-               return;
-
-       INIT_WORK(&event->work, tcpm_pd_rx_handler);
-       event->port = port;
-       memcpy(&event->msg, msg, sizeof(*msg));
-       queue_work(port->wq, &event->work);
-}
-EXPORT_SYMBOL_GPL(tcpm_pd_receive);
-
-static int tcpm_pd_send_control(struct tcpm_port *port,
-                               enum pd_ctrl_msg_type type)
-{
-       struct pd_message msg;
-
-       memset(&msg, 0, sizeof(msg));
-       msg.header = PD_HEADER_LE(type, port->pwr_role,
-                                 port->data_role,
-                                 port->negotiated_rev,
-                                 port->message_id, 0);
-
-       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
-}
-
-/*
- * Send queued message without affecting state.
- * Return true if state machine should go back to sleep,
- * false otherwise.
- */
-static bool tcpm_send_queued_message(struct tcpm_port *port)
-{
-       enum pd_msg_request queued_message;
-
-       do {
-               queued_message = port->queued_message;
-               port->queued_message = PD_MSG_NONE;
-
-               switch (queued_message) {
-               case PD_MSG_CTRL_WAIT:
-                       tcpm_pd_send_control(port, PD_CTRL_WAIT);
-                       break;
-               case PD_MSG_CTRL_REJECT:
-                       tcpm_pd_send_control(port, PD_CTRL_REJECT);
-                       break;
-               case PD_MSG_CTRL_NOT_SUPP:
-                       tcpm_pd_send_control(port, PD_CTRL_NOT_SUPP);
-                       break;
-               case PD_MSG_DATA_SINK_CAP:
-                       tcpm_pd_send_sink_caps(port);
-                       break;
-               case PD_MSG_DATA_SOURCE_CAP:
-                       tcpm_pd_send_source_caps(port);
-                       break;
-               default:
-                       break;
-               }
-       } while (port->queued_message != PD_MSG_NONE);
-
-       if (port->delayed_state != INVALID_STATE) {
-               if (time_is_after_jiffies(port->delayed_runtime)) {
-                       mod_delayed_work(port->wq, &port->state_machine,
-                                        port->delayed_runtime - jiffies);
-                       return true;
-               }
-               port->delayed_state = INVALID_STATE;
-       }
-       return false;
-}
-
-static int tcpm_pd_check_request(struct tcpm_port *port)
-{
-       u32 pdo, rdo = port->sink_request;
-       unsigned int max, op, pdo_max, index;
-       enum pd_pdo_type type;
-
-       index = rdo_index(rdo);
-       if (!index || index > port->nr_src_pdo)
-               return -EINVAL;
-
-       pdo = port->src_pdo[index - 1];
-       type = pdo_type(pdo);
-       switch (type) {
-       case PDO_TYPE_FIXED:
-       case PDO_TYPE_VAR:
-               max = rdo_max_current(rdo);
-               op = rdo_op_current(rdo);
-               pdo_max = pdo_max_current(pdo);
-
-               if (op > pdo_max)
-                       return -EINVAL;
-               if (max > pdo_max && !(rdo & RDO_CAP_MISMATCH))
-                       return -EINVAL;
-
-               if (type == PDO_TYPE_FIXED)
-                       tcpm_log(port,
-                                "Requested %u mV, %u mA for %u / %u mA",
-                                pdo_fixed_voltage(pdo), pdo_max, op, max);
-               else
-                       tcpm_log(port,
-                                "Requested %u -> %u mV, %u mA for %u / %u mA",
-                                pdo_min_voltage(pdo), pdo_max_voltage(pdo),
-                                pdo_max, op, max);
-               break;
-       case PDO_TYPE_BATT:
-               max = rdo_max_power(rdo);
-               op = rdo_op_power(rdo);
-               pdo_max = pdo_max_power(pdo);
-
-               if (op > pdo_max)
-                       return -EINVAL;
-               if (max > pdo_max && !(rdo & RDO_CAP_MISMATCH))
-                       return -EINVAL;
-               tcpm_log(port,
-                        "Requested %u -> %u mV, %u mW for %u / %u mW",
-                        pdo_min_voltage(pdo), pdo_max_voltage(pdo),
-                        pdo_max, op, max);
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       port->op_vsafe5v = index == 1;
-
-       return 0;
-}
-
-#define min_power(x, y) min(pdo_max_power(x), pdo_max_power(y))
-#define min_current(x, y) min(pdo_max_current(x), pdo_max_current(y))
-
-static int tcpm_pd_select_pdo(struct tcpm_port *port, int *sink_pdo,
-                             int *src_pdo)
-{
-       unsigned int i, j, max_src_mv = 0, min_src_mv = 0, max_mw = 0,
-                    max_mv = 0, src_mw = 0, src_ma = 0, max_snk_mv = 0,
-                    min_snk_mv = 0;
-       int ret = -EINVAL;
-
-       port->pps_data.supported = false;
-       port->usb_type = POWER_SUPPLY_USB_TYPE_PD;
-
-       /*
-        * Select the source PDO providing the most power which has a
-        * matchig sink cap.
-        */
-       for (i = 0; i < port->nr_source_caps; i++) {
-               u32 pdo = port->source_caps[i];
-               enum pd_pdo_type type = pdo_type(pdo);
-
-               switch (type) {
-               case PDO_TYPE_FIXED:
-                       max_src_mv = pdo_fixed_voltage(pdo);
-                       min_src_mv = max_src_mv;
-                       break;
-               case PDO_TYPE_BATT:
-               case PDO_TYPE_VAR:
-                       max_src_mv = pdo_max_voltage(pdo);
-                       min_src_mv = pdo_min_voltage(pdo);
-                       break;
-               case PDO_TYPE_APDO:
-                       if (pdo_apdo_type(pdo) == APDO_TYPE_PPS) {
-                               port->pps_data.supported = true;
-                               port->usb_type =
-                                       POWER_SUPPLY_USB_TYPE_PD_PPS;
-                       }
-                       continue;
-               default:
-                       tcpm_log(port, "Invalid source PDO type, ignoring");
-                       continue;
-               }
-
-               switch (type) {
-               case PDO_TYPE_FIXED:
-               case PDO_TYPE_VAR:
-                       src_ma = pdo_max_current(pdo);
-                       src_mw = src_ma * min_src_mv / 1000;
-                       break;
-               case PDO_TYPE_BATT:
-                       src_mw = pdo_max_power(pdo);
-                       break;
-               case PDO_TYPE_APDO:
-                       continue;
-               default:
-                       tcpm_log(port, "Invalid source PDO type, ignoring");
-                       continue;
-               }
-
-               for (j = 0; j < port->nr_snk_pdo; j++) {
-                       pdo = port->snk_pdo[j];
-
-                       switch (pdo_type(pdo)) {
-                       case PDO_TYPE_FIXED:
-                               max_snk_mv = pdo_fixed_voltage(pdo);
-                               min_snk_mv = max_snk_mv;
-                               break;
-                       case PDO_TYPE_BATT:
-                       case PDO_TYPE_VAR:
-                               max_snk_mv = pdo_max_voltage(pdo);
-                               min_snk_mv = pdo_min_voltage(pdo);
-                               break;
-                       case PDO_TYPE_APDO:
-                               continue;
-                       default:
-                               tcpm_log(port, "Invalid sink PDO type, ignoring");
-                               continue;
-                       }
-
-                       if (max_src_mv <= max_snk_mv &&
-                               min_src_mv >= min_snk_mv) {
-                               /* Prefer higher voltages if available */
-                               if ((src_mw == max_mw && min_src_mv > max_mv) ||
-                                                       src_mw > max_mw) {
-                                       *src_pdo = i;
-                                       *sink_pdo = j;
-                                       max_mw = src_mw;
-                                       max_mv = min_src_mv;
-                                       ret = 0;
-                               }
-                       }
-               }
-       }
-
-       return ret;
-}
-
-#define min_pps_apdo_current(x, y)     \
-       min(pdo_pps_apdo_max_current(x), pdo_pps_apdo_max_current(y))
-
-static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port)
-{
-       unsigned int i, j, max_mw = 0, max_mv = 0;
-       unsigned int min_src_mv, max_src_mv, src_ma, src_mw;
-       unsigned int min_snk_mv, max_snk_mv, snk_ma;
-       u32 pdo;
-       unsigned int src_pdo = 0, snk_pdo = 0;
-
-       /*
-        * Select the source PPS APDO providing the most power while staying
-        * within the board's limits. We skip the first PDO as this is always
-        * 5V 3A.
-        */
-       for (i = 1; i < port->nr_source_caps; ++i) {
-               pdo = port->source_caps[i];
-
-               switch (pdo_type(pdo)) {
-               case PDO_TYPE_APDO:
-                       if (pdo_apdo_type(pdo) != APDO_TYPE_PPS) {
-                               tcpm_log(port, "Not PPS APDO (source), ignoring");
-                               continue;
-                       }
-
-                       min_src_mv = pdo_pps_apdo_min_voltage(pdo);
-                       max_src_mv = pdo_pps_apdo_max_voltage(pdo);
-                       src_ma = pdo_pps_apdo_max_current(pdo);
-                       src_mw = (src_ma * max_src_mv) / 1000;
-
-                       /*
-                        * Now search through the sink PDOs to find a matching
-                        * PPS APDO. Again skip the first sink PDO as this will
-                        * always be 5V 3A.
-                        */
-                       for (j = 1; j < port->nr_snk_pdo; j++) {
-                               pdo = port->snk_pdo[j];
-
-                               switch (pdo_type(pdo)) {
-                               case PDO_TYPE_APDO:
-                                       if (pdo_apdo_type(pdo) != APDO_TYPE_PPS) {
-                                               tcpm_log(port,
-                                                        "Not PPS APDO (sink), ignoring");
-                                               continue;
-                                       }
-
-                                       min_snk_mv =
-                                               pdo_pps_apdo_min_voltage(pdo);
-                                       max_snk_mv =
-                                               pdo_pps_apdo_max_voltage(pdo);
-                                       snk_ma =
-                                               pdo_pps_apdo_max_current(pdo);
-                                       break;
-                               default:
-                                       tcpm_log(port,
-                                                "Not APDO type (sink), ignoring");
-                                       continue;
-                               }
-
-                               if (max_src_mv <= max_snk_mv &&
-                                   min_src_mv >= min_snk_mv) {
-                                       /* Prefer higher voltages if available */
-                                       if ((src_mw == max_mw &&
-                                            min_src_mv > max_mv) ||
-                                           src_mw > max_mw) {
-                                               src_pdo = i;
-                                               snk_pdo = j;
-                                               max_mw = src_mw;
-                                               max_mv = max_src_mv;
-                                       }
-                               }
-                       }
-
-                       break;
-               default:
-                       tcpm_log(port, "Not APDO type (source), ignoring");
-                       continue;
-               }
-       }
-
-       if (src_pdo) {
-               pdo = port->source_caps[src_pdo];
-
-               port->pps_data.min_volt = pdo_pps_apdo_min_voltage(pdo);
-               port->pps_data.max_volt = pdo_pps_apdo_max_voltage(pdo);
-               port->pps_data.max_curr =
-                       min_pps_apdo_current(pdo, port->snk_pdo[snk_pdo]);
-               port->pps_data.out_volt =
-                       min(pdo_pps_apdo_max_voltage(pdo), port->pps_data.out_volt);
-               port->pps_data.op_curr =
-                       min(port->pps_data.max_curr, port->pps_data.op_curr);
-       }
-
-       return src_pdo;
-}
-
-static int tcpm_pd_build_request(struct tcpm_port *port, u32 *rdo)
-{
-       unsigned int mv, ma, mw, flags;
-       unsigned int max_ma, max_mw;
-       enum pd_pdo_type type;
-       u32 pdo, matching_snk_pdo;
-       int src_pdo_index = 0;
-       int snk_pdo_index = 0;
-       int ret;
-
-       ret = tcpm_pd_select_pdo(port, &snk_pdo_index, &src_pdo_index);
-       if (ret < 0)
-               return ret;
-
-       pdo = port->source_caps[src_pdo_index];
-       matching_snk_pdo = port->snk_pdo[snk_pdo_index];
-       type = pdo_type(pdo);
-
-       switch (type) {
-       case PDO_TYPE_FIXED:
-               mv = pdo_fixed_voltage(pdo);
-               break;
-       case PDO_TYPE_BATT:
-       case PDO_TYPE_VAR:
-               mv = pdo_min_voltage(pdo);
-               break;
-       default:
-               tcpm_log(port, "Invalid PDO selected!");
-               return -EINVAL;
-       }
-
-       /* Select maximum available current within the sink pdo's limit */
-       if (type == PDO_TYPE_BATT) {
-               mw = min_power(pdo, matching_snk_pdo);
-               ma = 1000 * mw / mv;
-       } else {
-               ma = min_current(pdo, matching_snk_pdo);
-               mw = ma * mv / 1000;
-       }
-
-       flags = RDO_USB_COMM | RDO_NO_SUSPEND;
-
-       /* Set mismatch bit if offered power is less than operating power */
-       max_ma = ma;
-       max_mw = mw;
-       if (mw < port->operating_snk_mw) {
-               flags |= RDO_CAP_MISMATCH;
-               if (type == PDO_TYPE_BATT &&
-                   (pdo_max_power(matching_snk_pdo) > pdo_max_power(pdo)))
-                       max_mw = pdo_max_power(matching_snk_pdo);
-               else if (pdo_max_current(matching_snk_pdo) >
-                        pdo_max_current(pdo))
-                       max_ma = pdo_max_current(matching_snk_pdo);
-       }
-
-       tcpm_log(port, "cc=%d cc1=%d cc2=%d vbus=%d vconn=%s polarity=%d",
-                port->cc_req, port->cc1, port->cc2, port->vbus_source,
-                port->vconn_role == TYPEC_SOURCE ? "source" : "sink",
-                port->polarity);
-
-       if (type == PDO_TYPE_BATT) {
-               *rdo = RDO_BATT(src_pdo_index + 1, mw, max_mw, flags);
-
-               tcpm_log(port, "Requesting PDO %d: %u mV, %u mW%s",
-                        src_pdo_index, mv, mw,
-                        flags & RDO_CAP_MISMATCH ? " [mismatch]" : "");
-       } else {
-               *rdo = RDO_FIXED(src_pdo_index + 1, ma, max_ma, flags);
-
-               tcpm_log(port, "Requesting PDO %d: %u mV, %u mA%s",
-                        src_pdo_index, mv, ma,
-                        flags & RDO_CAP_MISMATCH ? " [mismatch]" : "");
-       }
-
-       port->current_limit = ma;
-       port->supply_voltage = mv;
-
-       return 0;
-}
-
-static int tcpm_pd_send_request(struct tcpm_port *port)
-{
-       struct pd_message msg;
-       int ret;
-       u32 rdo;
-
-       ret = tcpm_pd_build_request(port, &rdo);
-       if (ret < 0)
-               return ret;
-
-       memset(&msg, 0, sizeof(msg));
-       msg.header = PD_HEADER_LE(PD_DATA_REQUEST,
-                                 port->pwr_role,
-                                 port->data_role,
-                                 port->negotiated_rev,
-                                 port->message_id, 1);
-       msg.payload[0] = cpu_to_le32(rdo);
-
-       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
-}
-
-static int tcpm_pd_build_pps_request(struct tcpm_port *port, u32 *rdo)
-{
-       unsigned int out_mv, op_ma, op_mw, min_mv, max_mv, max_ma, flags;
-       enum pd_pdo_type type;
-       unsigned int src_pdo_index;
-       u32 pdo;
-
-       src_pdo_index = tcpm_pd_select_pps_apdo(port);
-       if (!src_pdo_index)
-               return -EOPNOTSUPP;
-
-       pdo = port->source_caps[src_pdo_index];
-       type = pdo_type(pdo);
-
-       switch (type) {
-       case PDO_TYPE_APDO:
-               if (pdo_apdo_type(pdo) != APDO_TYPE_PPS) {
-                       tcpm_log(port, "Invalid APDO selected!");
-                       return -EINVAL;
-               }
-               min_mv = port->pps_data.min_volt;
-               max_mv = port->pps_data.max_volt;
-               max_ma = port->pps_data.max_curr;
-               out_mv = port->pps_data.out_volt;
-               op_ma = port->pps_data.op_curr;
-               break;
-       default:
-               tcpm_log(port, "Invalid PDO selected!");
-               return -EINVAL;
-       }
-
-       flags = RDO_USB_COMM | RDO_NO_SUSPEND;
-
-       op_mw = (op_ma * out_mv) / 1000;
-       if (op_mw < port->operating_snk_mw) {
-               /*
-                * Try raising current to meet power needs. If that's not enough
-                * then try upping the voltage. If that's still not enough
-                * then we've obviously chosen a PPS APDO which really isn't
-                * suitable so abandon ship.
-                */
-               op_ma = (port->operating_snk_mw * 1000) / out_mv;
-               if ((port->operating_snk_mw * 1000) % out_mv)
-                       ++op_ma;
-               op_ma += RDO_PROG_CURR_MA_STEP - (op_ma % RDO_PROG_CURR_MA_STEP);
-
-               if (op_ma > max_ma) {
-                       op_ma = max_ma;
-                       out_mv = (port->operating_snk_mw * 1000) / op_ma;
-                       if ((port->operating_snk_mw * 1000) % op_ma)
-                               ++out_mv;
-                       out_mv += RDO_PROG_VOLT_MV_STEP -
-                                 (out_mv % RDO_PROG_VOLT_MV_STEP);
-
-                       if (out_mv > max_mv) {
-                               tcpm_log(port, "Invalid PPS APDO selected!");
-                               return -EINVAL;
-                       }
-               }
-       }
-
-       tcpm_log(port, "cc=%d cc1=%d cc2=%d vbus=%d vconn=%s polarity=%d",
-                port->cc_req, port->cc1, port->cc2, port->vbus_source,
-                port->vconn_role == TYPEC_SOURCE ? "source" : "sink",
-                port->polarity);
-
-       *rdo = RDO_PROG(src_pdo_index + 1, out_mv, op_ma, flags);
-
-       tcpm_log(port, "Requesting APDO %d: %u mV, %u mA",
-                src_pdo_index, out_mv, op_ma);
-
-       port->pps_data.op_curr = op_ma;
-       port->pps_data.out_volt = out_mv;
-
-       return 0;
-}
-
-static int tcpm_pd_send_pps_request(struct tcpm_port *port)
-{
-       struct pd_message msg;
-       int ret;
-       u32 rdo;
-
-       ret = tcpm_pd_build_pps_request(port, &rdo);
-       if (ret < 0)
-               return ret;
-
-       memset(&msg, 0, sizeof(msg));
-       msg.header = PD_HEADER_LE(PD_DATA_REQUEST,
-                                 port->pwr_role,
-                                 port->data_role,
-                                 port->negotiated_rev,
-                                 port->message_id, 1);
-       msg.payload[0] = cpu_to_le32(rdo);
-
-       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
-}
-
-static int tcpm_set_vbus(struct tcpm_port *port, bool enable)
-{
-       int ret;
-
-       if (enable && port->vbus_charge)
-               return -EINVAL;
-
-       tcpm_log(port, "vbus:=%d charge=%d", enable, port->vbus_charge);
-
-       ret = port->tcpc->set_vbus(port->tcpc, enable, port->vbus_charge);
-       if (ret < 0)
-               return ret;
-
-       port->vbus_source = enable;
-       return 0;
-}
-
-static int tcpm_set_charge(struct tcpm_port *port, bool charge)
-{
-       int ret;
-
-       if (charge && port->vbus_source)
-               return -EINVAL;
-
-       if (charge != port->vbus_charge) {
-               tcpm_log(port, "vbus=%d charge:=%d", port->vbus_source, charge);
-               ret = port->tcpc->set_vbus(port->tcpc, port->vbus_source,
-                                          charge);
-               if (ret < 0)
-                       return ret;
-       }
-       port->vbus_charge = charge;
-       return 0;
-}
-
-static bool tcpm_start_drp_toggling(struct tcpm_port *port,
-                                   enum typec_cc_status cc)
-{
-       int ret;
-
-       if (port->tcpc->start_drp_toggling &&
-           port->port_type == TYPEC_PORT_DRP) {
-               tcpm_log_force(port, "Start DRP toggling");
-               ret = port->tcpc->start_drp_toggling(port->tcpc, cc);
-               if (!ret)
-                       return true;
-       }
-
-       return false;
-}
-
-static void tcpm_set_cc(struct tcpm_port *port, enum typec_cc_status cc)
-{
-       tcpm_log(port, "cc:=%d", cc);
-       port->cc_req = cc;
-       port->tcpc->set_cc(port->tcpc, cc);
-}
-
-static int tcpm_init_vbus(struct tcpm_port *port)
-{
-       int ret;
-
-       ret = port->tcpc->set_vbus(port->tcpc, false, false);
-       port->vbus_source = false;
-       port->vbus_charge = false;
-       return ret;
-}
-
-static int tcpm_init_vconn(struct tcpm_port *port)
-{
-       int ret;
-
-       ret = port->tcpc->set_vconn(port->tcpc, false);
-       port->vconn_role = TYPEC_SINK;
-       return ret;
-}
-
-static void tcpm_typec_connect(struct tcpm_port *port)
-{
-       if (!port->connected) {
-               /* Make sure we don't report stale identity information */
-               memset(&port->partner_ident, 0, sizeof(port->partner_ident));
-               port->partner_desc.usb_pd = port->pd_capable;
-               if (tcpm_port_is_debug(port))
-                       port->partner_desc.accessory = TYPEC_ACCESSORY_DEBUG;
-               else if (tcpm_port_is_audio(port))
-                       port->partner_desc.accessory = TYPEC_ACCESSORY_AUDIO;
-               else
-                       port->partner_desc.accessory = TYPEC_ACCESSORY_NONE;
-               port->partner = typec_register_partner(port->typec_port,
-                                                      &port->partner_desc);
-               port->connected = true;
-       }
-}
-
-static int tcpm_src_attach(struct tcpm_port *port)
-{
-       enum typec_cc_polarity polarity =
-                               port->cc2 == TYPEC_CC_RD ? TYPEC_POLARITY_CC2
-                                                        : TYPEC_POLARITY_CC1;
-       int ret;
-
-       if (port->attached)
-               return 0;
-
-       ret = tcpm_set_polarity(port, polarity);
-       if (ret < 0)
-               return ret;
-
-       ret = tcpm_set_roles(port, true, TYPEC_SOURCE, TYPEC_HOST);
-       if (ret < 0)
-               return ret;
-
-       ret = port->tcpc->set_pd_rx(port->tcpc, true);
-       if (ret < 0)
-               goto out_disable_mux;
-
-       /*
-        * USB Type-C specification, version 1.2,
-        * chapter 4.5.2.2.8.1 (Attached.SRC Requirements)
-        * Enable VCONN only if the non-RD port is set to RA.
-        */
-       if ((polarity == TYPEC_POLARITY_CC1 && port->cc2 == TYPEC_CC_RA) ||
-           (polarity == TYPEC_POLARITY_CC2 && port->cc1 == TYPEC_CC_RA)) {
-               ret = tcpm_set_vconn(port, true);
-               if (ret < 0)
-                       goto out_disable_pd;
-       }
-
-       ret = tcpm_set_vbus(port, true);
-       if (ret < 0)
-               goto out_disable_vconn;
-
-       port->pd_capable = false;
-
-       port->partner = NULL;
-
-       port->attached = true;
-       port->send_discover = true;
-
-       return 0;
-
-out_disable_vconn:
-       tcpm_set_vconn(port, false);
-out_disable_pd:
-       port->tcpc->set_pd_rx(port->tcpc, false);
-out_disable_mux:
-       tcpm_mux_set(port, TYPEC_STATE_SAFE, USB_ROLE_NONE,
-                    TYPEC_ORIENTATION_NONE);
-       return ret;
-}
-
-static void tcpm_typec_disconnect(struct tcpm_port *port)
-{
-       if (port->connected) {
-               typec_unregister_partner(port->partner);
-               port->partner = NULL;
-               port->connected = false;
-       }
-}
-
-static void tcpm_unregister_altmodes(struct tcpm_port *port)
-{
-       struct pd_mode_data *modep = &port->mode_data;
-       int i;
-
-       for (i = 0; i < modep->altmodes; i++) {
-               typec_unregister_altmode(port->partner_altmode[i]);
-               port->partner_altmode[i] = NULL;
-       }
-
-       memset(modep, 0, sizeof(*modep));
-}
-
-static void tcpm_reset_port(struct tcpm_port *port)
-{
-       tcpm_unregister_altmodes(port);
-       tcpm_typec_disconnect(port);
-       port->attached = false;
-       port->pd_capable = false;
-       port->pps_data.supported = false;
-
-       /*
-        * First Rx ID should be 0; set this to a sentinel of -1 so that
-        * we can check tcpm_pd_rx_handler() if we had seen it before.
-        */
-       port->rx_msgid = -1;
-
-       port->tcpc->set_pd_rx(port->tcpc, false);
-       tcpm_init_vbus(port);   /* also disables charging */
-       tcpm_init_vconn(port);
-       tcpm_set_current_limit(port, 0, 0);
-       tcpm_set_polarity(port, TYPEC_POLARITY_CC1);
-       tcpm_mux_set(port, TYPEC_STATE_SAFE, USB_ROLE_NONE,
-                    TYPEC_ORIENTATION_NONE);
-       tcpm_set_attached_state(port, false);
-       port->try_src_count = 0;
-       port->try_snk_count = 0;
-       port->usb_type = POWER_SUPPLY_USB_TYPE_C;
-
-       power_supply_changed(port->psy);
-}
-
-static void tcpm_detach(struct tcpm_port *port)
-{
-       if (!port->attached)
-               return;
-
-       if (tcpm_port_is_disconnected(port))
-               port->hard_reset_count = 0;
-
-       tcpm_reset_port(port);
-}
-
-static void tcpm_src_detach(struct tcpm_port *port)
-{
-       tcpm_detach(port);
-}
-
-static int tcpm_snk_attach(struct tcpm_port *port)
-{
-       int ret;
-
-       if (port->attached)
-               return 0;
-
-       ret = tcpm_set_polarity(port, port->cc2 != TYPEC_CC_OPEN ?
-                               TYPEC_POLARITY_CC2 : TYPEC_POLARITY_CC1);
-       if (ret < 0)
-               return ret;
-
-       ret = tcpm_set_roles(port, true, TYPEC_SINK, TYPEC_DEVICE);
-       if (ret < 0)
-               return ret;
-
-       port->pd_capable = false;
-
-       port->partner = NULL;
-
-       port->attached = true;
-       port->send_discover = true;
-
-       return 0;
-}
-
-static void tcpm_snk_detach(struct tcpm_port *port)
-{
-       tcpm_detach(port);
-}
-
-static int tcpm_acc_attach(struct tcpm_port *port)
-{
-       int ret;
-
-       if (port->attached)
-               return 0;
-
-       ret = tcpm_set_roles(port, true, TYPEC_SOURCE, TYPEC_HOST);
-       if (ret < 0)
-               return ret;
-
-       port->partner = NULL;
-
-       tcpm_typec_connect(port);
-
-       port->attached = true;
-
-       return 0;
-}
-
-static void tcpm_acc_detach(struct tcpm_port *port)
-{
-       tcpm_detach(port);
-}
-
-static inline enum tcpm_state hard_reset_state(struct tcpm_port *port)
-{
-       if (port->hard_reset_count < PD_N_HARD_RESET_COUNT)
-               return HARD_RESET_SEND;
-       if (port->pd_capable)
-               return ERROR_RECOVERY;
-       if (port->pwr_role == TYPEC_SOURCE)
-               return SRC_UNATTACHED;
-       if (port->state == SNK_WAIT_CAPABILITIES)
-               return SNK_READY;
-       return SNK_UNATTACHED;
-}
-
-static inline enum tcpm_state unattached_state(struct tcpm_port *port)
-{
-       if (port->port_type == TYPEC_PORT_DRP) {
-               if (port->pwr_role == TYPEC_SOURCE)
-                       return SRC_UNATTACHED;
-               else
-                       return SNK_UNATTACHED;
-       } else if (port->port_type == TYPEC_PORT_SRC) {
-               return SRC_UNATTACHED;
-       }
-
-       return SNK_UNATTACHED;
-}
-
-static void tcpm_check_send_discover(struct tcpm_port *port)
-{
-       if (port->data_role == TYPEC_HOST && port->send_discover &&
-           port->pd_capable) {
-               tcpm_send_vdm(port, USB_SID_PD, CMD_DISCOVER_IDENT, NULL, 0);
-               port->send_discover = false;
-       }
-}
-
-static void tcpm_swap_complete(struct tcpm_port *port, int result)
-{
-       if (port->swap_pending) {
-               port->swap_status = result;
-               port->swap_pending = false;
-               port->non_pd_role_swap = false;
-               complete(&port->swap_complete);
-       }
-}
-
-static enum typec_pwr_opmode tcpm_get_pwr_opmode(enum typec_cc_status cc)
-{
-       switch (cc) {
-       case TYPEC_CC_RP_1_5:
-               return TYPEC_PWR_MODE_1_5A;
-       case TYPEC_CC_RP_3_0:
-               return TYPEC_PWR_MODE_3_0A;
-       case TYPEC_CC_RP_DEF:
-       default:
-               return TYPEC_PWR_MODE_USB;
-       }
-}
-
-static void run_state_machine(struct tcpm_port *port)
-{
-       int ret;
-       enum typec_pwr_opmode opmode;
-       unsigned int msecs;
-
-       port->enter_state = port->state;
-       switch (port->state) {
-       case DRP_TOGGLING:
-               break;
-       /* SRC states */
-       case SRC_UNATTACHED:
-               if (!port->non_pd_role_swap)
-                       tcpm_swap_complete(port, -ENOTCONN);
-               tcpm_src_detach(port);
-               if (tcpm_start_drp_toggling(port, tcpm_rp_cc(port))) {
-                       tcpm_set_state(port, DRP_TOGGLING, 0);
-                       break;
-               }
-               tcpm_set_cc(port, tcpm_rp_cc(port));
-               if (port->port_type == TYPEC_PORT_DRP)
-                       tcpm_set_state(port, SNK_UNATTACHED, PD_T_DRP_SNK);
-               break;
-       case SRC_ATTACH_WAIT:
-               if (tcpm_port_is_debug(port))
-                       tcpm_set_state(port, DEBUG_ACC_ATTACHED,
-                                      PD_T_CC_DEBOUNCE);
-               else if (tcpm_port_is_audio(port))
-                       tcpm_set_state(port, AUDIO_ACC_ATTACHED,
-                                      PD_T_CC_DEBOUNCE);
-               else if (tcpm_port_is_source(port))
-                       tcpm_set_state(port,
-                                      tcpm_try_snk(port) ? SNK_TRY
-                                                         : SRC_ATTACHED,
-                                      PD_T_CC_DEBOUNCE);
-               break;
-
-       case SNK_TRY:
-               port->try_snk_count++;
-               /*
-                * Requirements:
-                * - Do not drive vconn or vbus
-                * - Terminate CC pins (both) to Rd
-                * Action:
-                * - Wait for tDRPTry (PD_T_DRP_TRY).
-                *   Until then, ignore any state changes.
-                */
-               tcpm_set_cc(port, TYPEC_CC_RD);
-               tcpm_set_state(port, SNK_TRY_WAIT, PD_T_DRP_TRY);
-               break;
-       case SNK_TRY_WAIT:
-               if (tcpm_port_is_sink(port)) {
-                       tcpm_set_state(port, SNK_TRY_WAIT_DEBOUNCE, 0);
-               } else {
-                       tcpm_set_state(port, SRC_TRYWAIT, 0);
-                       port->max_wait = 0;
-               }
-               break;
-       case SNK_TRY_WAIT_DEBOUNCE:
-               tcpm_set_state(port, SNK_TRY_WAIT_DEBOUNCE_CHECK_VBUS,
-                              PD_T_PD_DEBOUNCE);
-               break;
-       case SNK_TRY_WAIT_DEBOUNCE_CHECK_VBUS:
-               if (port->vbus_present && tcpm_port_is_sink(port)) {
-                       tcpm_set_state(port, SNK_ATTACHED, 0);
-               } else {
-                       tcpm_set_state(port, SRC_TRYWAIT, 0);
-                       port->max_wait = 0;
-               }
-               break;
-       case SRC_TRYWAIT:
-               tcpm_set_cc(port, tcpm_rp_cc(port));
-               if (port->max_wait == 0) {
-                       port->max_wait = jiffies +
-                                        msecs_to_jiffies(PD_T_DRP_TRY);
-                       tcpm_set_state(port, SRC_TRYWAIT_UNATTACHED,
-                                      PD_T_DRP_TRY);
-               } else {
-                       if (time_is_after_jiffies(port->max_wait))
-                               tcpm_set_state(port, SRC_TRYWAIT_UNATTACHED,
-                                              jiffies_to_msecs(port->max_wait -
-                                                               jiffies));
-                       else
-                               tcpm_set_state(port, SNK_UNATTACHED, 0);
-               }
-               break;
-       case SRC_TRYWAIT_DEBOUNCE:
-               tcpm_set_state(port, SRC_ATTACHED, PD_T_CC_DEBOUNCE);
-               break;
-       case SRC_TRYWAIT_UNATTACHED:
-               tcpm_set_state(port, SNK_UNATTACHED, 0);
-               break;
-
-       case SRC_ATTACHED:
-               ret = tcpm_src_attach(port);
-               tcpm_set_state(port, SRC_UNATTACHED,
-                              ret < 0 ? 0 : PD_T_PS_SOURCE_ON);
-               break;
-       case SRC_STARTUP:
-               opmode =  tcpm_get_pwr_opmode(tcpm_rp_cc(port));
-               typec_set_pwr_opmode(port->typec_port, opmode);
-               port->pwr_opmode = TYPEC_PWR_MODE_USB;
-               port->caps_count = 0;
-               port->negotiated_rev = PD_MAX_REV;
-               port->message_id = 0;
-               port->rx_msgid = -1;
-               port->explicit_contract = false;
-               tcpm_set_state(port, SRC_SEND_CAPABILITIES, 0);
-               break;
-       case SRC_SEND_CAPABILITIES:
-               port->caps_count++;
-               if (port->caps_count > PD_N_CAPS_COUNT) {
-                       tcpm_set_state(port, SRC_READY, 0);
-                       break;
-               }
-               ret = tcpm_pd_send_source_caps(port);
-               if (ret < 0) {
-                       tcpm_set_state(port, SRC_SEND_CAPABILITIES,
-                                      PD_T_SEND_SOURCE_CAP);
-               } else {
-                       /*
-                        * Per standard, we should clear the reset counter here.
-                        * However, that can result in state machine hang-ups.
-                        * Reset it only in READY state to improve stability.
-                        */
-                       /* port->hard_reset_count = 0; */
-                       port->caps_count = 0;
-                       port->pd_capable = true;
-                       tcpm_set_state_cond(port, hard_reset_state(port),
-                                           PD_T_SEND_SOURCE_CAP);
-               }
-               break;
-       case SRC_NEGOTIATE_CAPABILITIES:
-               ret = tcpm_pd_check_request(port);
-               if (ret < 0) {
-                       tcpm_pd_send_control(port, PD_CTRL_REJECT);
-                       if (!port->explicit_contract) {
-                               tcpm_set_state(port,
-                                              SRC_WAIT_NEW_CAPABILITIES, 0);
-                       } else {
-                               tcpm_set_state(port, SRC_READY, 0);
-                       }
-               } else {
-                       tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
-                       tcpm_set_state(port, SRC_TRANSITION_SUPPLY,
-                                      PD_T_SRC_TRANSITION);
-               }
-               break;
-       case SRC_TRANSITION_SUPPLY:
-               /* XXX: regulator_set_voltage(vbus, ...) */
-               tcpm_pd_send_control(port, PD_CTRL_PS_RDY);
-               port->explicit_contract = true;
-               typec_set_pwr_opmode(port->typec_port, TYPEC_PWR_MODE_PD);
-               port->pwr_opmode = TYPEC_PWR_MODE_PD;
-               tcpm_set_state_cond(port, SRC_READY, 0);
-               break;
-       case SRC_READY:
-#if 1
-               port->hard_reset_count = 0;
-#endif
-               port->try_src_count = 0;
-
-               tcpm_swap_complete(port, 0);
-               tcpm_typec_connect(port);
-
-               tcpm_check_send_discover(port);
-               /*
-                * 6.3.5
-                * Sending ping messages is not necessary if
-                * - the source operates at vSafe5V
-                * or
-                * - The system is not operating in PD mode
-                * or
-                * - Both partners are connected using a Type-C connector
-                *
-                * There is no actual need to send PD messages since the local
-                * port type-c and the spec does not clearly say whether PD is
-                * possible when type-c is connected to Type-A/B
-                */
-               break;
-       case SRC_WAIT_NEW_CAPABILITIES:
-               /* Nothing to do... */
-               break;
-
-       /* SNK states */
-       case SNK_UNATTACHED:
-               if (!port->non_pd_role_swap)
-                       tcpm_swap_complete(port, -ENOTCONN);
-               tcpm_pps_complete(port, -ENOTCONN);
-               tcpm_snk_detach(port);
-               if (tcpm_start_drp_toggling(port, TYPEC_CC_RD)) {
-                       tcpm_set_state(port, DRP_TOGGLING, 0);
-                       break;
-               }
-               tcpm_set_cc(port, TYPEC_CC_RD);
-               if (port->port_type == TYPEC_PORT_DRP)
-                       tcpm_set_state(port, SRC_UNATTACHED, PD_T_DRP_SRC);
-               break;
-       case SNK_ATTACH_WAIT:
-               if ((port->cc1 == TYPEC_CC_OPEN &&
-                    port->cc2 != TYPEC_CC_OPEN) ||
-                   (port->cc1 != TYPEC_CC_OPEN &&
-                    port->cc2 == TYPEC_CC_OPEN))
-                       tcpm_set_state(port, SNK_DEBOUNCED,
-                                      PD_T_CC_DEBOUNCE);
-               else if (tcpm_port_is_disconnected(port))
-                       tcpm_set_state(port, SNK_UNATTACHED,
-                                      PD_T_PD_DEBOUNCE);
-               break;
-       case SNK_DEBOUNCED:
-               if (tcpm_port_is_disconnected(port))
-                       tcpm_set_state(port, SNK_UNATTACHED,
-                                      PD_T_PD_DEBOUNCE);
-               else if (port->vbus_present)
-                       tcpm_set_state(port,
-                                      tcpm_try_src(port) ? SRC_TRY
-                                                         : SNK_ATTACHED,
-                                      0);
-               else
-                       /* Wait for VBUS, but not forever */
-                       tcpm_set_state(port, PORT_RESET, PD_T_PS_SOURCE_ON);
-               break;
-
-       case SRC_TRY:
-               port->try_src_count++;
-               tcpm_set_cc(port, tcpm_rp_cc(port));
-               port->max_wait = 0;
-               tcpm_set_state(port, SRC_TRY_WAIT, 0);
-               break;
-       case SRC_TRY_WAIT:
-               if (port->max_wait == 0) {
-                       port->max_wait = jiffies +
-                                        msecs_to_jiffies(PD_T_DRP_TRY);
-                       msecs = PD_T_DRP_TRY;
-               } else {
-                       if (time_is_after_jiffies(port->max_wait))
-                               msecs = jiffies_to_msecs(port->max_wait -
-                                                        jiffies);
-                       else
-                               msecs = 0;
-               }
-               tcpm_set_state(port, SNK_TRYWAIT, msecs);
-               break;
-       case SRC_TRY_DEBOUNCE:
-               tcpm_set_state(port, SRC_ATTACHED, PD_T_PD_DEBOUNCE);
-               break;
-       case SNK_TRYWAIT:
-               tcpm_set_cc(port, TYPEC_CC_RD);
-               tcpm_set_state(port, SNK_TRYWAIT_VBUS, PD_T_CC_DEBOUNCE);
-               break;
-       case SNK_TRYWAIT_VBUS:
-               /*
-                * TCPM stays in this state indefinitely until VBUS
-                * is detected as long as Rp is not detected for
-                * more than a time period of tPDDebounce.
-                */
-               if (port->vbus_present && tcpm_port_is_sink(port)) {
-                       tcpm_set_state(port, SNK_ATTACHED, 0);
-                       break;
-               }
-               if (!tcpm_port_is_sink(port))
-                       tcpm_set_state(port, SNK_TRYWAIT_DEBOUNCE, 0);
-               break;
-       case SNK_TRYWAIT_DEBOUNCE:
-               tcpm_set_state(port, SNK_UNATTACHED, PD_T_PD_DEBOUNCE);
-               break;
-       case SNK_ATTACHED:
-               ret = tcpm_snk_attach(port);
-               if (ret < 0)
-                       tcpm_set_state(port, SNK_UNATTACHED, 0);
-               else
-                       tcpm_set_state(port, SNK_STARTUP, 0);
-               break;
-       case SNK_STARTUP:
-               opmode =  tcpm_get_pwr_opmode(port->polarity ?
-                                             port->cc2 : port->cc1);
-               typec_set_pwr_opmode(port->typec_port, opmode);
-               port->pwr_opmode = TYPEC_PWR_MODE_USB;
-               port->negotiated_rev = PD_MAX_REV;
-               port->message_id = 0;
-               port->rx_msgid = -1;
-               port->explicit_contract = false;
-               tcpm_set_state(port, SNK_DISCOVERY, 0);
-               break;
-       case SNK_DISCOVERY:
-               if (port->vbus_present) {
-                       tcpm_set_current_limit(port,
-                                              tcpm_get_current_limit(port),
-                                              5000);
-                       tcpm_set_charge(port, true);
-                       tcpm_set_state(port, SNK_WAIT_CAPABILITIES, 0);
-                       break;
-               }
-               /*
-                * For DRP, timeouts differ. Also, handling is supposed to be
-                * different and much more complex (dead battery detection;
-                * see USB power delivery specification, section 8.3.3.6.1.5.1).
-                */
-               tcpm_set_state(port, hard_reset_state(port),
-                              port->port_type == TYPEC_PORT_DRP ?
-                                       PD_T_DB_DETECT : PD_T_NO_RESPONSE);
-               break;
-       case SNK_DISCOVERY_DEBOUNCE:
-               tcpm_set_state(port, SNK_DISCOVERY_DEBOUNCE_DONE,
-                              PD_T_CC_DEBOUNCE);
-               break;
-       case SNK_DISCOVERY_DEBOUNCE_DONE:
-               if (!tcpm_port_is_disconnected(port) &&
-                   tcpm_port_is_sink(port) &&
-                   time_is_after_jiffies(port->delayed_runtime)) {
-                       tcpm_set_state(port, SNK_DISCOVERY,
-                                      jiffies_to_msecs(port->delayed_runtime -
-                                                       jiffies));
-                       break;
-               }
-               tcpm_set_state(port, unattached_state(port), 0);
-               break;
-       case SNK_WAIT_CAPABILITIES:
-               ret = port->tcpc->set_pd_rx(port->tcpc, true);
-               if (ret < 0) {
-                       tcpm_set_state(port, SNK_READY, 0);
-                       break;
-               }
-               /*
-                * If VBUS has never been low, and we time out waiting
-                * for source cap, try a soft reset first, in case we
-                * were already in a stable contract before this boot.
-                * Do this only once.
-                */
-               if (port->vbus_never_low) {
-                       port->vbus_never_low = false;
-                       tcpm_set_state(port, SOFT_RESET_SEND,
-                                      PD_T_SINK_WAIT_CAP);
-               } else {
-                       tcpm_set_state(port, hard_reset_state(port),
-                                      PD_T_SINK_WAIT_CAP);
-               }
-               break;
-       case SNK_NEGOTIATE_CAPABILITIES:
-               port->pd_capable = true;
-               port->hard_reset_count = 0;
-               ret = tcpm_pd_send_request(port);
-               if (ret < 0) {
-                       /* Let the Source send capabilities again. */
-                       tcpm_set_state(port, SNK_WAIT_CAPABILITIES, 0);
-               } else {
-                       tcpm_set_state_cond(port, hard_reset_state(port),
-                                           PD_T_SENDER_RESPONSE);
-               }
-               break;
-       case SNK_NEGOTIATE_PPS_CAPABILITIES:
-               ret = tcpm_pd_send_pps_request(port);
-               if (ret < 0) {
-                       port->pps_status = ret;
-                       /*
-                        * If this was called due to updates to sink
-                        * capabilities, and pps is no longer valid, we should
-                        * safely fall back to a standard PDO.
-                        */
-                       if (port->update_sink_caps)
-                               tcpm_set_state(port, SNK_NEGOTIATE_CAPABILITIES, 0);
-                       else
-                               tcpm_set_state(port, SNK_READY, 0);
-               } else {
-                       tcpm_set_state_cond(port, hard_reset_state(port),
-                                           PD_T_SENDER_RESPONSE);
-               }
-               break;
-       case SNK_TRANSITION_SINK:
-       case SNK_TRANSITION_SINK_VBUS:
-               tcpm_set_state(port, hard_reset_state(port),
-                              PD_T_PS_TRANSITION);
-               break;
-       case SNK_READY:
-               port->try_snk_count = 0;
-               port->update_sink_caps = false;
-               if (port->explicit_contract) {
-                       typec_set_pwr_opmode(port->typec_port,
-                                            TYPEC_PWR_MODE_PD);
-                       port->pwr_opmode = TYPEC_PWR_MODE_PD;
-               }
-
-               tcpm_swap_complete(port, 0);
-               tcpm_typec_connect(port);
-               tcpm_check_send_discover(port);
-               tcpm_pps_complete(port, port->pps_status);
-
-               power_supply_changed(port->psy);
-
-               break;
-
-       /* Accessory states */
-       case ACC_UNATTACHED:
-               tcpm_acc_detach(port);
-               tcpm_set_state(port, SRC_UNATTACHED, 0);
-               break;
-       case DEBUG_ACC_ATTACHED:
-       case AUDIO_ACC_ATTACHED:
-               ret = tcpm_acc_attach(port);
-               if (ret < 0)
-                       tcpm_set_state(port, ACC_UNATTACHED, 0);
-               break;
-       case AUDIO_ACC_DEBOUNCE:
-               tcpm_set_state(port, ACC_UNATTACHED, PD_T_CC_DEBOUNCE);
-               break;
-
-       /* Hard_Reset states */
-       case HARD_RESET_SEND:
-               tcpm_pd_transmit(port, TCPC_TX_HARD_RESET, NULL);
-               tcpm_set_state(port, HARD_RESET_START, 0);
-               break;
-       case HARD_RESET_START:
-               port->hard_reset_count++;
-               port->tcpc->set_pd_rx(port->tcpc, false);
-               tcpm_unregister_altmodes(port);
-               port->send_discover = true;
-               if (port->pwr_role == TYPEC_SOURCE)
-                       tcpm_set_state(port, SRC_HARD_RESET_VBUS_OFF,
-                                      PD_T_PS_HARD_RESET);
-               else
-                       tcpm_set_state(port, SNK_HARD_RESET_SINK_OFF, 0);
-               break;
-       case SRC_HARD_RESET_VBUS_OFF:
-               tcpm_set_vconn(port, true);
-               tcpm_set_vbus(port, false);
-               tcpm_set_roles(port, false, TYPEC_SOURCE, TYPEC_HOST);
-               tcpm_set_state(port, SRC_HARD_RESET_VBUS_ON, PD_T_SRC_RECOVER);
-               break;
-       case SRC_HARD_RESET_VBUS_ON:
-               tcpm_set_vbus(port, true);
-               port->tcpc->set_pd_rx(port->tcpc, true);
-               tcpm_set_attached_state(port, true);
-               tcpm_set_state(port, SRC_UNATTACHED, PD_T_PS_SOURCE_ON);
-               break;
-       case SNK_HARD_RESET_SINK_OFF:
-               memset(&port->pps_data, 0, sizeof(port->pps_data));
-               tcpm_set_vconn(port, false);
-               tcpm_set_charge(port, false);
-               tcpm_set_roles(port, false, TYPEC_SINK, TYPEC_DEVICE);
-               /*
-                * VBUS may or may not toggle, depending on the adapter.
-                * If it doesn't toggle, transition to SNK_HARD_RESET_SINK_ON
-                * directly after timeout.
-                */
-               tcpm_set_state(port, SNK_HARD_RESET_SINK_ON, PD_T_SAFE_0V);
-               break;
-       case SNK_HARD_RESET_WAIT_VBUS:
-               /* Assume we're disconnected if VBUS doesn't come back. */
-               tcpm_set_state(port, SNK_UNATTACHED,
-                              PD_T_SRC_RECOVER_MAX + PD_T_SRC_TURN_ON);
-               break;
-       case SNK_HARD_RESET_SINK_ON:
-               /* Note: There is no guarantee that VBUS is on in this state */
-               /*
-                * XXX:
-                * The specification suggests that dual mode ports in sink
-                * mode should transition to state PE_SRC_Transition_to_default.
-                * See USB power delivery specification chapter 8.3.3.6.1.3.
-                * This would mean to to
-                * - turn off VCONN, reset power supply
-                * - request hardware reset
-                * - turn on VCONN
-                * - Transition to state PE_Src_Startup
-                * SNK only ports shall transition to state Snk_Startup
-                * (see chapter 8.3.3.3.8).
-                * Similar, dual-mode ports in source mode should transition
-                * to PE_SNK_Transition_to_default.
-                */
-               tcpm_set_attached_state(port, true);
-               tcpm_set_state(port, SNK_STARTUP, 0);
-               break;
-
-       /* Soft_Reset states */
-       case SOFT_RESET:
-               port->message_id = 0;
-               port->rx_msgid = -1;
-               tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
-               if (port->pwr_role == TYPEC_SOURCE)
-                       tcpm_set_state(port, SRC_SEND_CAPABILITIES, 0);
-               else
-                       tcpm_set_state(port, SNK_WAIT_CAPABILITIES, 0);
-               break;
-       case SOFT_RESET_SEND:
-               port->message_id = 0;
-               port->rx_msgid = -1;
-               if (tcpm_pd_send_control(port, PD_CTRL_SOFT_RESET))
-                       tcpm_set_state_cond(port, hard_reset_state(port), 0);
-               else
-                       tcpm_set_state_cond(port, hard_reset_state(port),
-                                           PD_T_SENDER_RESPONSE);
-               break;
-
-       /* DR_Swap states */
-       case DR_SWAP_SEND:
-               tcpm_pd_send_control(port, PD_CTRL_DR_SWAP);
-               tcpm_set_state_cond(port, DR_SWAP_SEND_TIMEOUT,
-                                   PD_T_SENDER_RESPONSE);
-               break;
-       case DR_SWAP_ACCEPT:
-               tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
-               tcpm_set_state_cond(port, DR_SWAP_CHANGE_DR, 0);
-               break;
-       case DR_SWAP_SEND_TIMEOUT:
-               tcpm_swap_complete(port, -ETIMEDOUT);
-               tcpm_set_state(port, ready_state(port), 0);
-               break;
-       case DR_SWAP_CHANGE_DR:
-               if (port->data_role == TYPEC_HOST) {
-                       tcpm_unregister_altmodes(port);
-                       tcpm_set_roles(port, true, port->pwr_role,
-                                      TYPEC_DEVICE);
-               } else {
-                       tcpm_set_roles(port, true, port->pwr_role,
-                                      TYPEC_HOST);
-                       port->send_discover = true;
-               }
-               tcpm_set_state(port, ready_state(port), 0);
-               break;
-
-       /* PR_Swap states */
-       case PR_SWAP_ACCEPT:
-               tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
-               tcpm_set_state(port, PR_SWAP_START, 0);
-               break;
-       case PR_SWAP_SEND:
-               tcpm_pd_send_control(port, PD_CTRL_PR_SWAP);
-               tcpm_set_state_cond(port, PR_SWAP_SEND_TIMEOUT,
-                                   PD_T_SENDER_RESPONSE);
-               break;
-       case PR_SWAP_SEND_TIMEOUT:
-               tcpm_swap_complete(port, -ETIMEDOUT);
-               tcpm_set_state(port, ready_state(port), 0);
-               break;
-       case PR_SWAP_START:
-               if (port->pwr_role == TYPEC_SOURCE)
-                       tcpm_set_state(port, PR_SWAP_SRC_SNK_TRANSITION_OFF,
-                                      PD_T_SRC_TRANSITION);
-               else
-                       tcpm_set_state(port, PR_SWAP_SNK_SRC_SINK_OFF, 0);
-               break;
-       case PR_SWAP_SRC_SNK_TRANSITION_OFF:
-               tcpm_set_vbus(port, false);
-               port->explicit_contract = false;
-               /* allow time for Vbus discharge, must be < tSrcSwapStdby */
-               tcpm_set_state(port, PR_SWAP_SRC_SNK_SOURCE_OFF,
-                              PD_T_SRCSWAPSTDBY);
-               break;
-       case PR_SWAP_SRC_SNK_SOURCE_OFF:
-               tcpm_set_cc(port, TYPEC_CC_RD);
-               /* allow CC debounce */
-               tcpm_set_state(port, PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED,
-                              PD_T_CC_DEBOUNCE);
-               break;
-       case PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED:
-               /*
-                * USB-PD standard, 6.2.1.4, Port Power Role:
-                * "During the Power Role Swap Sequence, for the initial Source
-                * Port, the Port Power Role field shall be set to Sink in the
-                * PS_RDY Message indicating that the initial Source’s power
-                * supply is turned off"
-                */
-               tcpm_set_pwr_role(port, TYPEC_SINK);
-               if (tcpm_pd_send_control(port, PD_CTRL_PS_RDY)) {
-                       tcpm_set_state(port, ERROR_RECOVERY, 0);
-                       break;
-               }
-               tcpm_set_state_cond(port, SNK_UNATTACHED, PD_T_PS_SOURCE_ON);
-               break;
-       case PR_SWAP_SRC_SNK_SINK_ON:
-               tcpm_set_state(port, SNK_STARTUP, 0);
-               break;
-       case PR_SWAP_SNK_SRC_SINK_OFF:
-               tcpm_set_charge(port, false);
-               tcpm_set_state(port, hard_reset_state(port),
-                              PD_T_PS_SOURCE_OFF);
-               break;
-       case PR_SWAP_SNK_SRC_SOURCE_ON:
-               tcpm_set_cc(port, tcpm_rp_cc(port));
-               tcpm_set_vbus(port, true);
-               /*
-                * allow time VBUS ramp-up, must be < tNewSrc
-                * Also, this window overlaps with CC debounce as well.
-                * So, Wait for the max of two which is PD_T_NEWSRC
-                */
-               tcpm_set_state(port, PR_SWAP_SNK_SRC_SOURCE_ON_VBUS_RAMPED_UP,
-                              PD_T_NEWSRC);
-               break;
-       case PR_SWAP_SNK_SRC_SOURCE_ON_VBUS_RAMPED_UP:
-               /*
-                * USB PD standard, 6.2.1.4:
-                * "Subsequent Messages initiated by the Policy Engine,
-                * such as the PS_RDY Message sent to indicate that Vbus
-                * is ready, will have the Port Power Role field set to
-                * Source."
-                */
-               tcpm_set_pwr_role(port, TYPEC_SOURCE);
-               tcpm_pd_send_control(port, PD_CTRL_PS_RDY);
-               tcpm_set_state(port, SRC_STARTUP, 0);
-               break;
-
-       case VCONN_SWAP_ACCEPT:
-               tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
-               tcpm_set_state(port, VCONN_SWAP_START, 0);
-               break;
-       case VCONN_SWAP_SEND:
-               tcpm_pd_send_control(port, PD_CTRL_VCONN_SWAP);
-               tcpm_set_state(port, VCONN_SWAP_SEND_TIMEOUT,
-                              PD_T_SENDER_RESPONSE);
-               break;
-       case VCONN_SWAP_SEND_TIMEOUT:
-               tcpm_swap_complete(port, -ETIMEDOUT);
-               tcpm_set_state(port, ready_state(port), 0);
-               break;
-       case VCONN_SWAP_START:
-               if (port->vconn_role == TYPEC_SOURCE)
-                       tcpm_set_state(port, VCONN_SWAP_WAIT_FOR_VCONN, 0);
-               else
-                       tcpm_set_state(port, VCONN_SWAP_TURN_ON_VCONN, 0);
-               break;
-       case VCONN_SWAP_WAIT_FOR_VCONN:
-               tcpm_set_state(port, hard_reset_state(port),
-                              PD_T_VCONN_SOURCE_ON);
-               break;
-       case VCONN_SWAP_TURN_ON_VCONN:
-               tcpm_set_vconn(port, true);
-               tcpm_pd_send_control(port, PD_CTRL_PS_RDY);
-               tcpm_set_state(port, ready_state(port), 0);
-               break;
-       case VCONN_SWAP_TURN_OFF_VCONN:
-               tcpm_set_vconn(port, false);
-               tcpm_set_state(port, ready_state(port), 0);
-               break;
-
-       case DR_SWAP_CANCEL:
-       case PR_SWAP_CANCEL:
-       case VCONN_SWAP_CANCEL:
-               tcpm_swap_complete(port, port->swap_status);
-               if (port->pwr_role == TYPEC_SOURCE)
-                       tcpm_set_state(port, SRC_READY, 0);
-               else
-                       tcpm_set_state(port, SNK_READY, 0);
-               break;
-
-       case BIST_RX:
-               switch (BDO_MODE_MASK(port->bist_request)) {
-               case BDO_MODE_CARRIER2:
-                       tcpm_pd_transmit(port, TCPC_TX_BIST_MODE_2, NULL);
-                       break;
-               default:
-                       break;
-               }
-               /* Always switch to unattached state */
-               tcpm_set_state(port, unattached_state(port), 0);
-               break;
-       case GET_STATUS_SEND:
-               tcpm_pd_send_control(port, PD_CTRL_GET_STATUS);
-               tcpm_set_state(port, GET_STATUS_SEND_TIMEOUT,
-                              PD_T_SENDER_RESPONSE);
-               break;
-       case GET_STATUS_SEND_TIMEOUT:
-               tcpm_set_state(port, ready_state(port), 0);
-               break;
-       case GET_PPS_STATUS_SEND:
-               tcpm_pd_send_control(port, PD_CTRL_GET_PPS_STATUS);
-               tcpm_set_state(port, GET_PPS_STATUS_SEND_TIMEOUT,
-                              PD_T_SENDER_RESPONSE);
-               break;
-       case GET_PPS_STATUS_SEND_TIMEOUT:
-               tcpm_set_state(port, ready_state(port), 0);
-               break;
-       case ERROR_RECOVERY:
-               tcpm_swap_complete(port, -EPROTO);
-               tcpm_pps_complete(port, -EPROTO);
-               tcpm_set_state(port, PORT_RESET, 0);
-               break;
-       case PORT_RESET:
-               tcpm_reset_port(port);
-               tcpm_set_cc(port, TYPEC_CC_OPEN);
-               tcpm_set_state(port, PORT_RESET_WAIT_OFF,
-                              PD_T_ERROR_RECOVERY);
-               break;
-       case PORT_RESET_WAIT_OFF:
-               tcpm_set_state(port,
-                              tcpm_default_state(port),
-                              port->vbus_present ? PD_T_PS_SOURCE_OFF : 0);
-               break;
-       default:
-               WARN(1, "Unexpected port state %d\n", port->state);
-               break;
-       }
-}
-
-static void tcpm_state_machine_work(struct work_struct *work)
-{
-       struct tcpm_port *port = container_of(work, struct tcpm_port,
-                                             state_machine.work);
-       enum tcpm_state prev_state;
-
-       mutex_lock(&port->lock);
-       port->state_machine_running = true;
-
-       if (port->queued_message && tcpm_send_queued_message(port))
-               goto done;
-
-       /* If we were queued due to a delayed state change, update it now */
-       if (port->delayed_state) {
-               tcpm_log(port, "state change %s -> %s [delayed %ld ms]",
-                        tcpm_states[port->state],
-                        tcpm_states[port->delayed_state], port->delay_ms);
-               port->prev_state = port->state;
-               port->state = port->delayed_state;
-               port->delayed_state = INVALID_STATE;
-       }
-
-       /*
-        * Continue running as long as we have (non-delayed) state changes
-        * to make.
-        */
-       do {
-               prev_state = port->state;
-               run_state_machine(port);
-               if (port->queued_message)
-                       tcpm_send_queued_message(port);
-       } while (port->state != prev_state && !port->delayed_state);
-
-done:
-       port->state_machine_running = false;
-       mutex_unlock(&port->lock);
-}
-
-static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
-                           enum typec_cc_status cc2)
-{
-       enum typec_cc_status old_cc1, old_cc2;
-       enum tcpm_state new_state;
-
-       old_cc1 = port->cc1;
-       old_cc2 = port->cc2;
-       port->cc1 = cc1;
-       port->cc2 = cc2;
-
-       tcpm_log_force(port,
-                      "CC1: %u -> %u, CC2: %u -> %u [state %s, polarity %d, %s]",
-                      old_cc1, cc1, old_cc2, cc2, tcpm_states[port->state],
-                      port->polarity,
-                      tcpm_port_is_disconnected(port) ? "disconnected"
-                                                      : "connected");
-
-       switch (port->state) {
-       case DRP_TOGGLING:
-               if (tcpm_port_is_debug(port) || tcpm_port_is_audio(port) ||
-                   tcpm_port_is_source(port))
-                       tcpm_set_state(port, SRC_ATTACH_WAIT, 0);
-               else if (tcpm_port_is_sink(port))
-                       tcpm_set_state(port, SNK_ATTACH_WAIT, 0);
-               break;
-       case SRC_UNATTACHED:
-       case ACC_UNATTACHED:
-               if (tcpm_port_is_debug(port) || tcpm_port_is_audio(port) ||
-                   tcpm_port_is_source(port))
-                       tcpm_set_state(port, SRC_ATTACH_WAIT, 0);
-               break;
-       case SRC_ATTACH_WAIT:
-               if (tcpm_port_is_disconnected(port) ||
-                   tcpm_port_is_audio_detached(port))
-                       tcpm_set_state(port, SRC_UNATTACHED, 0);
-               else if (cc1 != old_cc1 || cc2 != old_cc2)
-                       tcpm_set_state(port, SRC_ATTACH_WAIT, 0);
-               break;
-       case SRC_ATTACHED:
-       case SRC_SEND_CAPABILITIES:
-       case SRC_READY:
-               if (tcpm_port_is_disconnected(port) ||
-                   !tcpm_port_is_source(port))
-                       tcpm_set_state(port, SRC_UNATTACHED, 0);
-               break;
-       case SNK_UNATTACHED:
-               if (tcpm_port_is_sink(port))
-                       tcpm_set_state(port, SNK_ATTACH_WAIT, 0);
-               break;
-       case SNK_ATTACH_WAIT:
-               if ((port->cc1 == TYPEC_CC_OPEN &&
-                    port->cc2 != TYPEC_CC_OPEN) ||
-                   (port->cc1 != TYPEC_CC_OPEN &&
-                    port->cc2 == TYPEC_CC_OPEN))
-                       new_state = SNK_DEBOUNCED;
-               else if (tcpm_port_is_disconnected(port))
-                       new_state = SNK_UNATTACHED;
-               else
-                       break;
-               if (new_state != port->delayed_state)
-                       tcpm_set_state(port, SNK_ATTACH_WAIT, 0);
-               break;
-       case SNK_DEBOUNCED:
-               if (tcpm_port_is_disconnected(port))
-                       new_state = SNK_UNATTACHED;
-               else if (port->vbus_present)
-                       new_state = tcpm_try_src(port) ? SRC_TRY : SNK_ATTACHED;
-               else
-                       new_state = SNK_UNATTACHED;
-               if (new_state != port->delayed_state)
-                       tcpm_set_state(port, SNK_DEBOUNCED, 0);
-               break;
-       case SNK_READY:
-               if (tcpm_port_is_disconnected(port))
-                       tcpm_set_state(port, unattached_state(port), 0);
-               else if (!port->pd_capable &&
-                        (cc1 != old_cc1 || cc2 != old_cc2))
-                       tcpm_set_current_limit(port,
-                                              tcpm_get_current_limit(port),
-                                              5000);
-               break;
-
-       case AUDIO_ACC_ATTACHED:
-               if (cc1 == TYPEC_CC_OPEN || cc2 == TYPEC_CC_OPEN)
-                       tcpm_set_state(port, AUDIO_ACC_DEBOUNCE, 0);
-               break;
-       case AUDIO_ACC_DEBOUNCE:
-               if (tcpm_port_is_audio(port))
-                       tcpm_set_state(port, AUDIO_ACC_ATTACHED, 0);
-               break;
-
-       case DEBUG_ACC_ATTACHED:
-               if (cc1 == TYPEC_CC_OPEN || cc2 == TYPEC_CC_OPEN)
-                       tcpm_set_state(port, ACC_UNATTACHED, 0);
-               break;
-
-       case SNK_TRY:
-               /* Do nothing, waiting for timeout */
-               break;
-
-       case SNK_DISCOVERY:
-               /* CC line is unstable, wait for debounce */
-               if (tcpm_port_is_disconnected(port))
-                       tcpm_set_state(port, SNK_DISCOVERY_DEBOUNCE, 0);
-               break;
-       case SNK_DISCOVERY_DEBOUNCE:
-               break;
-
-       case SRC_TRYWAIT:
-               /* Hand over to state machine if needed */
-               if (!port->vbus_present && tcpm_port_is_source(port))
-                       tcpm_set_state(port, SRC_TRYWAIT_DEBOUNCE, 0);
-               break;
-       case SRC_TRYWAIT_DEBOUNCE:
-               if (port->vbus_present || !tcpm_port_is_source(port))
-                       tcpm_set_state(port, SRC_TRYWAIT, 0);
-               break;
-       case SNK_TRY_WAIT_DEBOUNCE:
-               if (!tcpm_port_is_sink(port)) {
-                       port->max_wait = 0;
-                       tcpm_set_state(port, SRC_TRYWAIT, 0);
-               }
-               break;
-       case SRC_TRY_WAIT:
-               if (tcpm_port_is_source(port))
-                       tcpm_set_state(port, SRC_TRY_DEBOUNCE, 0);
-               break;
-       case SRC_TRY_DEBOUNCE:
-               tcpm_set_state(port, SRC_TRY_WAIT, 0);
-               break;
-       case SNK_TRYWAIT_DEBOUNCE:
-               if (tcpm_port_is_sink(port))
-                       tcpm_set_state(port, SNK_TRYWAIT_VBUS, 0);
-               break;
-       case SNK_TRYWAIT_VBUS:
-               if (!tcpm_port_is_sink(port))
-                       tcpm_set_state(port, SNK_TRYWAIT_DEBOUNCE, 0);
-               break;
-       case SNK_TRYWAIT:
-               /* Do nothing, waiting for tCCDebounce */
-               break;
-       case PR_SWAP_SNK_SRC_SINK_OFF:
-       case PR_SWAP_SRC_SNK_TRANSITION_OFF:
-       case PR_SWAP_SRC_SNK_SOURCE_OFF:
-       case PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED:
-       case PR_SWAP_SNK_SRC_SOURCE_ON:
-               /*
-                * CC state change is expected in PR_SWAP
-                * Ignore it.
-                */
-               break;
-
-       default:
-               if (tcpm_port_is_disconnected(port))
-                       tcpm_set_state(port, unattached_state(port), 0);
-               break;
-       }
-}
-
-static void _tcpm_pd_vbus_on(struct tcpm_port *port)
-{
-       tcpm_log_force(port, "VBUS on");
-       port->vbus_present = true;
-       switch (port->state) {
-       case SNK_TRANSITION_SINK_VBUS:
-               port->explicit_contract = true;
-               tcpm_set_state(port, SNK_READY, 0);
-               break;
-       case SNK_DISCOVERY:
-               tcpm_set_state(port, SNK_DISCOVERY, 0);
-               break;
-
-       case SNK_DEBOUNCED:
-               tcpm_set_state(port, tcpm_try_src(port) ? SRC_TRY
-                                                       : SNK_ATTACHED,
-                                      0);
-               break;
-       case SNK_HARD_RESET_WAIT_VBUS:
-               tcpm_set_state(port, SNK_HARD_RESET_SINK_ON, 0);
-               break;
-       case SRC_ATTACHED:
-               tcpm_set_state(port, SRC_STARTUP, 0);
-               break;
-       case SRC_HARD_RESET_VBUS_ON:
-               tcpm_set_state(port, SRC_STARTUP, 0);
-               break;
-
-       case SNK_TRY:
-               /* Do nothing, waiting for timeout */
-               break;
-       case SRC_TRYWAIT:
-               /* Do nothing, Waiting for Rd to be detected */
-               break;
-       case SRC_TRYWAIT_DEBOUNCE:
-               tcpm_set_state(port, SRC_TRYWAIT, 0);
-               break;
-       case SNK_TRY_WAIT_DEBOUNCE:
-               /* Do nothing, waiting for PD_DEBOUNCE to do be done */
-               break;
-       case SNK_TRYWAIT:
-               /* Do nothing, waiting for tCCDebounce */
-               break;
-       case SNK_TRYWAIT_VBUS:
-               if (tcpm_port_is_sink(port))
-                       tcpm_set_state(port, SNK_ATTACHED, 0);
-               break;
-       case SNK_TRYWAIT_DEBOUNCE:
-               /* Do nothing, waiting for Rp */
-               break;
-       case SRC_TRY_WAIT:
-       case SRC_TRY_DEBOUNCE:
-               /* Do nothing, waiting for sink detection */
-               break;
-       default:
-               break;
-       }
-}
-
-static void _tcpm_pd_vbus_off(struct tcpm_port *port)
-{
-       tcpm_log_force(port, "VBUS off");
-       port->vbus_present = false;
-       port->vbus_never_low = false;
-       switch (port->state) {
-       case SNK_HARD_RESET_SINK_OFF:
-               tcpm_set_state(port, SNK_HARD_RESET_WAIT_VBUS, 0);
-               break;
-       case SRC_HARD_RESET_VBUS_OFF:
-               tcpm_set_state(port, SRC_HARD_RESET_VBUS_ON, 0);
-               break;
-       case HARD_RESET_SEND:
-               break;
-
-       case SNK_TRY:
-               /* Do nothing, waiting for timeout */
-               break;
-       case SRC_TRYWAIT:
-               /* Hand over to state machine if needed */
-               if (tcpm_port_is_source(port))
-                       tcpm_set_state(port, SRC_TRYWAIT_DEBOUNCE, 0);
-               break;
-       case SNK_TRY_WAIT_DEBOUNCE:
-               /* Do nothing, waiting for PD_DEBOUNCE to do be done */
-               break;
-       case SNK_TRYWAIT:
-       case SNK_TRYWAIT_VBUS:
-       case SNK_TRYWAIT_DEBOUNCE:
-               break;
-       case SNK_ATTACH_WAIT:
-               tcpm_set_state(port, SNK_UNATTACHED, 0);
-               break;
-
-       case SNK_NEGOTIATE_CAPABILITIES:
-               break;
-
-       case PR_SWAP_SRC_SNK_TRANSITION_OFF:
-               tcpm_set_state(port, PR_SWAP_SRC_SNK_SOURCE_OFF, 0);
-               break;
-
-       case PR_SWAP_SNK_SRC_SINK_OFF:
-               /* Do nothing, expected */
-               break;
-
-       case PORT_RESET_WAIT_OFF:
-               tcpm_set_state(port, tcpm_default_state(port), 0);
-               break;
-       case SRC_TRY_WAIT:
-       case SRC_TRY_DEBOUNCE:
-               /* Do nothing, waiting for sink detection */
-               break;
-       default:
-               if (port->pwr_role == TYPEC_SINK &&
-                   port->attached)
-                       tcpm_set_state(port, SNK_UNATTACHED, 0);
-               break;
-       }
-}
-
-static void _tcpm_pd_hard_reset(struct tcpm_port *port)
-{
-       tcpm_log_force(port, "Received hard reset");
-       /*
-        * If we keep receiving hard reset requests, executing the hard reset
-        * must have failed. Revert to error recovery if that happens.
-        */
-       tcpm_set_state(port,
-                      port->hard_reset_count < PD_N_HARD_RESET_COUNT ?
-                               HARD_RESET_START : ERROR_RECOVERY,
-                      0);
-}
-
-static void tcpm_pd_event_handler(struct work_struct *work)
-{
-       struct tcpm_port *port = container_of(work, struct tcpm_port,
-                                             event_work);
-       u32 events;
-
-       mutex_lock(&port->lock);
-
-       spin_lock(&port->pd_event_lock);
-       while (port->pd_events) {
-               events = port->pd_events;
-               port->pd_events = 0;
-               spin_unlock(&port->pd_event_lock);
-               if (events & TCPM_RESET_EVENT)
-                       _tcpm_pd_hard_reset(port);
-               if (events & TCPM_VBUS_EVENT) {
-                       bool vbus;
-
-                       vbus = port->tcpc->get_vbus(port->tcpc);
-                       if (vbus)
-                               _tcpm_pd_vbus_on(port);
-                       else
-                               _tcpm_pd_vbus_off(port);
-               }
-               if (events & TCPM_CC_EVENT) {
-                       enum typec_cc_status cc1, cc2;
-
-                       if (port->tcpc->get_cc(port->tcpc, &cc1, &cc2) == 0)
-                               _tcpm_cc_change(port, cc1, cc2);
-               }
-               spin_lock(&port->pd_event_lock);
-       }
-       spin_unlock(&port->pd_event_lock);
-       mutex_unlock(&port->lock);
-}
-
-void tcpm_cc_change(struct tcpm_port *port)
-{
-       spin_lock(&port->pd_event_lock);
-       port->pd_events |= TCPM_CC_EVENT;
-       spin_unlock(&port->pd_event_lock);
-       queue_work(port->wq, &port->event_work);
-}
-EXPORT_SYMBOL_GPL(tcpm_cc_change);
-
-void tcpm_vbus_change(struct tcpm_port *port)
-{
-       spin_lock(&port->pd_event_lock);
-       port->pd_events |= TCPM_VBUS_EVENT;
-       spin_unlock(&port->pd_event_lock);
-       queue_work(port->wq, &port->event_work);
-}
-EXPORT_SYMBOL_GPL(tcpm_vbus_change);
-
-void tcpm_pd_hard_reset(struct tcpm_port *port)
-{
-       spin_lock(&port->pd_event_lock);
-       port->pd_events = TCPM_RESET_EVENT;
-       spin_unlock(&port->pd_event_lock);
-       queue_work(port->wq, &port->event_work);
-}
-EXPORT_SYMBOL_GPL(tcpm_pd_hard_reset);
-
-static int tcpm_dr_set(const struct typec_capability *cap,
-                      enum typec_data_role data)
-{
-       struct tcpm_port *port = typec_cap_to_tcpm(cap);
-       int ret;
-
-       mutex_lock(&port->swap_lock);
-       mutex_lock(&port->lock);
-
-       if (port->port_type != TYPEC_PORT_DRP) {
-               ret = -EINVAL;
-               goto port_unlock;
-       }
-       if (port->state != SRC_READY && port->state != SNK_READY) {
-               ret = -EAGAIN;
-               goto port_unlock;
-       }
-
-       if (port->data_role == data) {
-               ret = 0;
-               goto port_unlock;
-       }
-
-       /*
-        * XXX
-        * 6.3.9: If an alternate mode is active, a request to swap
-        * alternate modes shall trigger a port reset.
-        * Reject data role swap request in this case.
-        */
-
-       if (!port->pd_capable) {
-               /*
-                * If the partner is not PD capable, reset the port to
-                * trigger a role change. This can only work if a preferred
-                * role is configured, and if it matches the requested role.
-                */
-               if (port->try_role == TYPEC_NO_PREFERRED_ROLE ||
-                   port->try_role == port->pwr_role) {
-                       ret = -EINVAL;
-                       goto port_unlock;
-               }
-               port->non_pd_role_swap = true;
-               tcpm_set_state(port, PORT_RESET, 0);
-       } else {
-               tcpm_set_state(port, DR_SWAP_SEND, 0);
-       }
-
-       port->swap_status = 0;
-       port->swap_pending = true;
-       reinit_completion(&port->swap_complete);
-       mutex_unlock(&port->lock);
-
-       if (!wait_for_completion_timeout(&port->swap_complete,
-                               msecs_to_jiffies(PD_ROLE_SWAP_TIMEOUT)))
-               ret = -ETIMEDOUT;
-       else
-               ret = port->swap_status;
-
-       port->non_pd_role_swap = false;
-       goto swap_unlock;
-
-port_unlock:
-       mutex_unlock(&port->lock);
-swap_unlock:
-       mutex_unlock(&port->swap_lock);
-       return ret;
-}
-
-static int tcpm_pr_set(const struct typec_capability *cap,
-                      enum typec_role role)
-{
-       struct tcpm_port *port = typec_cap_to_tcpm(cap);
-       int ret;
-
-       mutex_lock(&port->swap_lock);
-       mutex_lock(&port->lock);
-
-       if (port->port_type != TYPEC_PORT_DRP) {
-               ret = -EINVAL;
-               goto port_unlock;
-       }
-       if (port->state != SRC_READY && port->state != SNK_READY) {
-               ret = -EAGAIN;
-               goto port_unlock;
-       }
-
-       if (role == port->pwr_role) {
-               ret = 0;
-               goto port_unlock;
-       }
-
-       port->swap_status = 0;
-       port->swap_pending = true;
-       reinit_completion(&port->swap_complete);
-       tcpm_set_state(port, PR_SWAP_SEND, 0);
-       mutex_unlock(&port->lock);
-
-       if (!wait_for_completion_timeout(&port->swap_complete,
-                               msecs_to_jiffies(PD_ROLE_SWAP_TIMEOUT)))
-               ret = -ETIMEDOUT;
-       else
-               ret = port->swap_status;
-
-       goto swap_unlock;
-
-port_unlock:
-       mutex_unlock(&port->lock);
-swap_unlock:
-       mutex_unlock(&port->swap_lock);
-       return ret;
-}
-
-static int tcpm_vconn_set(const struct typec_capability *cap,
-                         enum typec_role role)
-{
-       struct tcpm_port *port = typec_cap_to_tcpm(cap);
-       int ret;
-
-       mutex_lock(&port->swap_lock);
-       mutex_lock(&port->lock);
-
-       if (port->state != SRC_READY && port->state != SNK_READY) {
-               ret = -EAGAIN;
-               goto port_unlock;
-       }
-
-       if (role == port->vconn_role) {
-               ret = 0;
-               goto port_unlock;
-       }
-
-       port->swap_status = 0;
-       port->swap_pending = true;
-       reinit_completion(&port->swap_complete);
-       tcpm_set_state(port, VCONN_SWAP_SEND, 0);
-       mutex_unlock(&port->lock);
-
-       if (!wait_for_completion_timeout(&port->swap_complete,
-                               msecs_to_jiffies(PD_ROLE_SWAP_TIMEOUT)))
-               ret = -ETIMEDOUT;
-       else
-               ret = port->swap_status;
-
-       goto swap_unlock;
-
-port_unlock:
-       mutex_unlock(&port->lock);
-swap_unlock:
-       mutex_unlock(&port->swap_lock);
-       return ret;
-}
-
-static int tcpm_try_role(const struct typec_capability *cap, int role)
-{
-       struct tcpm_port *port = typec_cap_to_tcpm(cap);
-       struct tcpc_dev *tcpc = port->tcpc;
-       int ret = 0;
-
-       mutex_lock(&port->lock);
-       if (tcpc->try_role)
-               ret = tcpc->try_role(tcpc, role);
-       if (!ret && !tcpc->config->try_role_hw)
-               port->try_role = role;
-       port->try_src_count = 0;
-       port->try_snk_count = 0;
-       mutex_unlock(&port->lock);
-
-       return ret;
-}
-
-static int tcpm_pps_set_op_curr(struct tcpm_port *port, u16 op_curr)
-{
-       unsigned int target_mw;
-       int ret;
-
-       mutex_lock(&port->swap_lock);
-       mutex_lock(&port->lock);
-
-       if (!port->pps_data.active) {
-               ret = -EOPNOTSUPP;
-               goto port_unlock;
-       }
-
-       if (port->state != SNK_READY) {
-               ret = -EAGAIN;
-               goto port_unlock;
-       }
-
-       if (op_curr > port->pps_data.max_curr) {
-               ret = -EINVAL;
-               goto port_unlock;
-       }
-
-       target_mw = (op_curr * port->pps_data.out_volt) / 1000;
-       if (target_mw < port->operating_snk_mw) {
-               ret = -EINVAL;
-               goto port_unlock;
-       }
-
-       reinit_completion(&port->pps_complete);
-       port->pps_data.op_curr = op_curr;
-       port->pps_status = 0;
-       port->pps_pending = true;
-       tcpm_set_state(port, SNK_NEGOTIATE_PPS_CAPABILITIES, 0);
-       mutex_unlock(&port->lock);
-
-       if (!wait_for_completion_timeout(&port->pps_complete,
-                               msecs_to_jiffies(PD_PPS_CTRL_TIMEOUT)))
-               ret = -ETIMEDOUT;
-       else
-               ret = port->pps_status;
-
-       goto swap_unlock;
-
-port_unlock:
-       mutex_unlock(&port->lock);
-swap_unlock:
-       mutex_unlock(&port->swap_lock);
-
-       return ret;
-}
-
-static int tcpm_pps_set_out_volt(struct tcpm_port *port, u16 out_volt)
-{
-       unsigned int target_mw;
-       int ret;
-
-       mutex_lock(&port->swap_lock);
-       mutex_lock(&port->lock);
-
-       if (!port->pps_data.active) {
-               ret = -EOPNOTSUPP;
-               goto port_unlock;
-       }
-
-       if (port->state != SNK_READY) {
-               ret = -EAGAIN;
-               goto port_unlock;
-       }
-
-       if (out_volt < port->pps_data.min_volt ||
-           out_volt > port->pps_data.max_volt) {
-               ret = -EINVAL;
-               goto port_unlock;
-       }
-
-       target_mw = (port->pps_data.op_curr * out_volt) / 1000;
-       if (target_mw < port->operating_snk_mw) {
-               ret = -EINVAL;
-               goto port_unlock;
-       }
-
-       reinit_completion(&port->pps_complete);
-       port->pps_data.out_volt = out_volt;
-       port->pps_status = 0;
-       port->pps_pending = true;
-       tcpm_set_state(port, SNK_NEGOTIATE_PPS_CAPABILITIES, 0);
-       mutex_unlock(&port->lock);
-
-       if (!wait_for_completion_timeout(&port->pps_complete,
-                               msecs_to_jiffies(PD_PPS_CTRL_TIMEOUT)))
-               ret = -ETIMEDOUT;
-       else
-               ret = port->pps_status;
-
-       goto swap_unlock;
-
-port_unlock:
-       mutex_unlock(&port->lock);
-swap_unlock:
-       mutex_unlock(&port->swap_lock);
-
-       return ret;
-}
-
-static int tcpm_pps_activate(struct tcpm_port *port, bool activate)
-{
-       int ret = 0;
-
-       mutex_lock(&port->swap_lock);
-       mutex_lock(&port->lock);
-
-       if (!port->pps_data.supported) {
-               ret = -EOPNOTSUPP;
-               goto port_unlock;
-       }
-
-       /* Trying to deactivate PPS when already deactivated so just bail */
-       if (!port->pps_data.active && !activate)
-               goto port_unlock;
-
-       if (port->state != SNK_READY) {
-               ret = -EAGAIN;
-               goto port_unlock;
-       }
-
-       reinit_completion(&port->pps_complete);
-       port->pps_status = 0;
-       port->pps_pending = true;
-
-       /* Trigger PPS request or move back to standard PDO contract */
-       if (activate) {
-               port->pps_data.out_volt = port->supply_voltage;
-               port->pps_data.op_curr = port->current_limit;
-               tcpm_set_state(port, SNK_NEGOTIATE_PPS_CAPABILITIES, 0);
-       } else {
-               tcpm_set_state(port, SNK_NEGOTIATE_CAPABILITIES, 0);
-       }
-       mutex_unlock(&port->lock);
-
-       if (!wait_for_completion_timeout(&port->pps_complete,
-                               msecs_to_jiffies(PD_PPS_CTRL_TIMEOUT)))
-               ret = -ETIMEDOUT;
-       else
-               ret = port->pps_status;
-
-       goto swap_unlock;
-
-port_unlock:
-       mutex_unlock(&port->lock);
-swap_unlock:
-       mutex_unlock(&port->swap_lock);
-
-       return ret;
-}
-
-static void tcpm_init(struct tcpm_port *port)
-{
-       enum typec_cc_status cc1, cc2;
-
-       port->tcpc->init(port->tcpc);
-
-       tcpm_reset_port(port);
-
-       /*
-        * XXX
-        * Should possibly wait for VBUS to settle if it was enabled locally
-        * since tcpm_reset_port() will disable VBUS.
-        */
-       port->vbus_present = port->tcpc->get_vbus(port->tcpc);
-       if (port->vbus_present)
-               port->vbus_never_low = true;
-
-       tcpm_set_state(port, tcpm_default_state(port), 0);
-
-       if (port->tcpc->get_cc(port->tcpc, &cc1, &cc2) == 0)
-               _tcpm_cc_change(port, cc1, cc2);
-
-       /*
-        * Some adapters need a clean slate at startup, and won't recover
-        * otherwise. So do not try to be fancy and force a clean disconnect.
-        */
-       tcpm_set_state(port, PORT_RESET, 0);
-}
-
-static int tcpm_port_type_set(const struct typec_capability *cap,
-                             enum typec_port_type type)
-{
-       struct tcpm_port *port = typec_cap_to_tcpm(cap);
-
-       mutex_lock(&port->lock);
-       if (type == port->port_type)
-               goto port_unlock;
-
-       port->port_type = type;
-
-       if (!port->connected) {
-               tcpm_set_state(port, PORT_RESET, 0);
-       } else if (type == TYPEC_PORT_SNK) {
-               if (!(port->pwr_role == TYPEC_SINK &&
-                     port->data_role == TYPEC_DEVICE))
-                       tcpm_set_state(port, PORT_RESET, 0);
-       } else if (type == TYPEC_PORT_SRC) {
-               if (!(port->pwr_role == TYPEC_SOURCE &&
-                     port->data_role == TYPEC_HOST))
-                       tcpm_set_state(port, PORT_RESET, 0);
-       }
-
-port_unlock:
-       mutex_unlock(&port->lock);
-       return 0;
-}
-
-void tcpm_tcpc_reset(struct tcpm_port *port)
-{
-       mutex_lock(&port->lock);
-       /* XXX: Maintain PD connection if possible? */
-       tcpm_init(port);
-       mutex_unlock(&port->lock);
-}
-EXPORT_SYMBOL_GPL(tcpm_tcpc_reset);
-
-static int tcpm_copy_pdos(u32 *dest_pdo, const u32 *src_pdo,
-                         unsigned int nr_pdo)
-{
-       unsigned int i;
-
-       if (nr_pdo > PDO_MAX_OBJECTS)
-               nr_pdo = PDO_MAX_OBJECTS;
-
-       for (i = 0; i < nr_pdo; i++)
-               dest_pdo[i] = src_pdo[i];
-
-       return nr_pdo;
-}
-
-static int tcpm_copy_vdos(u32 *dest_vdo, const u32 *src_vdo,
-                         unsigned int nr_vdo)
-{
-       unsigned int i;
-
-       if (nr_vdo > VDO_MAX_OBJECTS)
-               nr_vdo = VDO_MAX_OBJECTS;
-
-       for (i = 0; i < nr_vdo; i++)
-               dest_vdo[i] = src_vdo[i];
-
-       return nr_vdo;
-}
-
-static int tcpm_fw_get_caps(struct tcpm_port *port,
-                           struct fwnode_handle *fwnode)
-{
-       const char *cap_str;
-       int ret;
-       u32 mw;
-
-       if (!fwnode)
-               return -EINVAL;
-
-       /* USB data support is optional */
-       ret = fwnode_property_read_string(fwnode, "data-role", &cap_str);
-       if (ret == 0) {
-               port->typec_caps.data = typec_find_port_data_role(cap_str);
-               if (port->typec_caps.data < 0)
-                       return -EINVAL;
-       }
-
-       ret = fwnode_property_read_string(fwnode, "power-role", &cap_str);
-       if (ret < 0)
-               return ret;
-
-       port->typec_caps.type = typec_find_port_power_role(cap_str);
-       if (port->typec_caps.type < 0)
-               return -EINVAL;
-       port->port_type = port->typec_caps.type;
-
-       if (port->port_type == TYPEC_PORT_SNK)
-               goto sink;
-
-       /* Get source pdos */
-       ret = fwnode_property_read_u32_array(fwnode, "source-pdos",
-                                            NULL, 0);
-       if (ret <= 0)
-               return -EINVAL;
-
-       port->nr_src_pdo = min(ret, PDO_MAX_OBJECTS);
-       ret = fwnode_property_read_u32_array(fwnode, "source-pdos",
-                                            port->src_pdo, port->nr_src_pdo);
-       if ((ret < 0) || tcpm_validate_caps(port, port->src_pdo,
-                                           port->nr_src_pdo))
-               return -EINVAL;
-
-       if (port->port_type == TYPEC_PORT_SRC)
-               return 0;
-
-       /* Get the preferred power role for DRP */
-       ret = fwnode_property_read_string(fwnode, "try-power-role", &cap_str);
-       if (ret < 0)
-               return ret;
-
-       port->typec_caps.prefer_role = typec_find_power_role(cap_str);
-       if (port->typec_caps.prefer_role < 0)
-               return -EINVAL;
-sink:
-       /* Get sink pdos */
-       ret = fwnode_property_read_u32_array(fwnode, "sink-pdos",
-                                            NULL, 0);
-       if (ret <= 0)
-               return -EINVAL;
-
-       port->nr_snk_pdo = min(ret, PDO_MAX_OBJECTS);
-       ret = fwnode_property_read_u32_array(fwnode, "sink-pdos",
-                                            port->snk_pdo, port->nr_snk_pdo);
-       if ((ret < 0) || tcpm_validate_caps(port, port->snk_pdo,
-                                           port->nr_snk_pdo))
-               return -EINVAL;
-
-       if (fwnode_property_read_u32(fwnode, "op-sink-microwatt", &mw) < 0)
-               return -EINVAL;
-       port->operating_snk_mw = mw / 1000;
-
-       return 0;
-}
-
-int tcpm_update_source_capabilities(struct tcpm_port *port, const u32 *pdo,
-                                   unsigned int nr_pdo)
-{
-       if (tcpm_validate_caps(port, pdo, nr_pdo))
-               return -EINVAL;
-
-       mutex_lock(&port->lock);
-       port->nr_src_pdo = tcpm_copy_pdos(port->src_pdo, pdo, nr_pdo);
-       switch (port->state) {
-       case SRC_UNATTACHED:
-       case SRC_ATTACH_WAIT:
-       case SRC_TRYWAIT:
-               tcpm_set_cc(port, tcpm_rp_cc(port));
-               break;
-       case SRC_SEND_CAPABILITIES:
-       case SRC_NEGOTIATE_CAPABILITIES:
-       case SRC_READY:
-       case SRC_WAIT_NEW_CAPABILITIES:
-               tcpm_set_cc(port, tcpm_rp_cc(port));
-               tcpm_set_state(port, SRC_SEND_CAPABILITIES, 0);
-               break;
-       default:
-               break;
-       }
-       mutex_unlock(&port->lock);
-       return 0;
-}
-EXPORT_SYMBOL_GPL(tcpm_update_source_capabilities);
-
-int tcpm_update_sink_capabilities(struct tcpm_port *port, const u32 *pdo,
-                                 unsigned int nr_pdo,
-                                 unsigned int operating_snk_mw)
-{
-       if (tcpm_validate_caps(port, pdo, nr_pdo))
-               return -EINVAL;
-
-       mutex_lock(&port->lock);
-       port->nr_snk_pdo = tcpm_copy_pdos(port->snk_pdo, pdo, nr_pdo);
-       port->operating_snk_mw = operating_snk_mw;
-       port->update_sink_caps = true;
-
-       switch (port->state) {
-       case SNK_NEGOTIATE_CAPABILITIES:
-       case SNK_NEGOTIATE_PPS_CAPABILITIES:
-       case SNK_READY:
-       case SNK_TRANSITION_SINK:
-       case SNK_TRANSITION_SINK_VBUS:
-               if (port->pps_data.active)
-                       tcpm_set_state(port, SNK_NEGOTIATE_PPS_CAPABILITIES, 0);
-               else
-                       tcpm_set_state(port, SNK_NEGOTIATE_CAPABILITIES, 0);
-               break;
-       default:
-               break;
-       }
-       mutex_unlock(&port->lock);
-       return 0;
-}
-EXPORT_SYMBOL_GPL(tcpm_update_sink_capabilities);
-
-/* Power Supply access to expose source power information */
-enum tcpm_psy_online_states {
-       TCPM_PSY_OFFLINE = 0,
-       TCPM_PSY_FIXED_ONLINE,
-       TCPM_PSY_PROG_ONLINE,
-};
-
-static enum power_supply_property tcpm_psy_props[] = {
-       POWER_SUPPLY_PROP_USB_TYPE,
-       POWER_SUPPLY_PROP_ONLINE,
-       POWER_SUPPLY_PROP_VOLTAGE_MIN,
-       POWER_SUPPLY_PROP_VOLTAGE_MAX,
-       POWER_SUPPLY_PROP_VOLTAGE_NOW,
-       POWER_SUPPLY_PROP_CURRENT_MAX,
-       POWER_SUPPLY_PROP_CURRENT_NOW,
-};
-
-static int tcpm_psy_get_online(struct tcpm_port *port,
-                              union power_supply_propval *val)
-{
-       if (port->vbus_charge) {
-               if (port->pps_data.active)
-                       val->intval = TCPM_PSY_PROG_ONLINE;
-               else
-                       val->intval = TCPM_PSY_FIXED_ONLINE;
-       } else {
-               val->intval = TCPM_PSY_OFFLINE;
-       }
-
-       return 0;
-}
-
-static int tcpm_psy_get_voltage_min(struct tcpm_port *port,
-                                   union power_supply_propval *val)
-{
-       if (port->pps_data.active)
-               val->intval = port->pps_data.min_volt * 1000;
-       else
-               val->intval = port->supply_voltage * 1000;
-
-       return 0;
-}
-
-static int tcpm_psy_get_voltage_max(struct tcpm_port *port,
-                                   union power_supply_propval *val)
-{
-       if (port->pps_data.active)
-               val->intval = port->pps_data.max_volt * 1000;
-       else
-               val->intval = port->supply_voltage * 1000;
-
-       return 0;
-}
-
-static int tcpm_psy_get_voltage_now(struct tcpm_port *port,
-                                   union power_supply_propval *val)
-{
-       val->intval = port->supply_voltage * 1000;
-
-       return 0;
-}
-
-static int tcpm_psy_get_current_max(struct tcpm_port *port,
-                                   union power_supply_propval *val)
-{
-       if (port->pps_data.active)
-               val->intval = port->pps_data.max_curr * 1000;
-       else
-               val->intval = port->current_limit * 1000;
-
-       return 0;
-}
-
-static int tcpm_psy_get_current_now(struct tcpm_port *port,
-                                   union power_supply_propval *val)
-{
-       val->intval = port->current_limit * 1000;
-
-       return 0;
-}
-
-static int tcpm_psy_get_prop(struct power_supply *psy,
-                            enum power_supply_property psp,
-                            union power_supply_propval *val)
-{
-       struct tcpm_port *port = power_supply_get_drvdata(psy);
-       int ret = 0;
-
-       switch (psp) {
-       case POWER_SUPPLY_PROP_USB_TYPE:
-               val->intval = port->usb_type;
-               break;
-       case POWER_SUPPLY_PROP_ONLINE:
-               ret = tcpm_psy_get_online(port, val);
-               break;
-       case POWER_SUPPLY_PROP_VOLTAGE_MIN:
-               ret = tcpm_psy_get_voltage_min(port, val);
-               break;
-       case POWER_SUPPLY_PROP_VOLTAGE_MAX:
-               ret = tcpm_psy_get_voltage_max(port, val);
-               break;
-       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-               ret = tcpm_psy_get_voltage_now(port, val);
-               break;
-       case POWER_SUPPLY_PROP_CURRENT_MAX:
-               ret = tcpm_psy_get_current_max(port, val);
-               break;
-       case POWER_SUPPLY_PROP_CURRENT_NOW:
-               ret = tcpm_psy_get_current_now(port, val);
-               break;
-       default:
-               ret = -EINVAL;
-               break;
-       }
-
-       return ret;
-}
-
-static int tcpm_psy_set_online(struct tcpm_port *port,
-                              const union power_supply_propval *val)
-{
-       int ret;
-
-       switch (val->intval) {
-       case TCPM_PSY_FIXED_ONLINE:
-               ret = tcpm_pps_activate(port, false);
-               break;
-       case TCPM_PSY_PROG_ONLINE:
-               ret = tcpm_pps_activate(port, true);
-               break;
-       default:
-               ret = -EINVAL;
-               break;
-       }
-
-       return ret;
-}
-
-static int tcpm_psy_set_prop(struct power_supply *psy,
-                            enum power_supply_property psp,
-                            const union power_supply_propval *val)
-{
-       struct tcpm_port *port = power_supply_get_drvdata(psy);
-       int ret;
-
-       switch (psp) {
-       case POWER_SUPPLY_PROP_ONLINE:
-               ret = tcpm_psy_set_online(port, val);
-               break;
-       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-               if (val->intval < port->pps_data.min_volt * 1000 ||
-                   val->intval > port->pps_data.max_volt * 1000)
-                       ret = -EINVAL;
-               else
-                       ret = tcpm_pps_set_out_volt(port, val->intval / 1000);
-               break;
-       case POWER_SUPPLY_PROP_CURRENT_NOW:
-               if (val->intval > port->pps_data.max_curr * 1000)
-                       ret = -EINVAL;
-               else
-                       ret = tcpm_pps_set_op_curr(port, val->intval / 1000);
-               break;
-       default:
-               ret = -EINVAL;
-               break;
-       }
-
-       return ret;
-}
-
-static int tcpm_psy_prop_writeable(struct power_supply *psy,
-                                  enum power_supply_property psp)
-{
-       switch (psp) {
-       case POWER_SUPPLY_PROP_ONLINE:
-       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-       case POWER_SUPPLY_PROP_CURRENT_NOW:
-               return 1;
-       default:
-               return 0;
-       }
-}
-
-static enum power_supply_usb_type tcpm_psy_usb_types[] = {
-       POWER_SUPPLY_USB_TYPE_C,
-       POWER_SUPPLY_USB_TYPE_PD,
-       POWER_SUPPLY_USB_TYPE_PD_PPS,
-};
-
-static const char *tcpm_psy_name_prefix = "tcpm-source-psy-";
-
-static int devm_tcpm_psy_register(struct tcpm_port *port)
-{
-       struct power_supply_config psy_cfg = {};
-       const char *port_dev_name = dev_name(port->dev);
-       size_t psy_name_len = strlen(tcpm_psy_name_prefix) +
-                                    strlen(port_dev_name) + 1;
-       char *psy_name;
-
-       psy_cfg.drv_data = port;
-       psy_cfg.fwnode = dev_fwnode(port->dev);
-       psy_name = devm_kzalloc(port->dev, psy_name_len, GFP_KERNEL);
-       if (!psy_name)
-               return -ENOMEM;
-
-       snprintf(psy_name, psy_name_len, "%s%s", tcpm_psy_name_prefix,
-                port_dev_name);
-       port->psy_desc.name = psy_name;
-       port->psy_desc.type = POWER_SUPPLY_TYPE_USB,
-       port->psy_desc.usb_types = tcpm_psy_usb_types;
-       port->psy_desc.num_usb_types = ARRAY_SIZE(tcpm_psy_usb_types);
-       port->psy_desc.properties = tcpm_psy_props,
-       port->psy_desc.num_properties = ARRAY_SIZE(tcpm_psy_props),
-       port->psy_desc.get_property = tcpm_psy_get_prop,
-       port->psy_desc.set_property = tcpm_psy_set_prop,
-       port->psy_desc.property_is_writeable = tcpm_psy_prop_writeable,
-
-       port->usb_type = POWER_SUPPLY_USB_TYPE_C;
-
-       port->psy = devm_power_supply_register(port->dev, &port->psy_desc,
-                                              &psy_cfg);
-
-       return PTR_ERR_OR_ZERO(port->psy);
-}
-
-static int tcpm_copy_caps(struct tcpm_port *port,
-                         const struct tcpc_config *tcfg)
-{
-       if (tcpm_validate_caps(port, tcfg->src_pdo, tcfg->nr_src_pdo) ||
-           tcpm_validate_caps(port, tcfg->snk_pdo, tcfg->nr_snk_pdo))
-               return -EINVAL;
-
-       port->nr_src_pdo = tcpm_copy_pdos(port->src_pdo, tcfg->src_pdo,
-                                         tcfg->nr_src_pdo);
-       port->nr_snk_pdo = tcpm_copy_pdos(port->snk_pdo, tcfg->snk_pdo,
-                                         tcfg->nr_snk_pdo);
-
-       port->nr_snk_vdo = tcpm_copy_vdos(port->snk_vdo, tcfg->snk_vdo,
-                                         tcfg->nr_snk_vdo);
-
-       port->operating_snk_mw = tcfg->operating_snk_mw;
-
-       port->typec_caps.prefer_role = tcfg->default_role;
-       port->typec_caps.type = tcfg->type;
-       port->typec_caps.data = tcfg->data;
-
-       return 0;
-}
-
-struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
-{
-       struct tcpm_port *port;
-       int i, err;
-
-       if (!dev || !tcpc ||
-           !tcpc->get_vbus || !tcpc->set_cc || !tcpc->get_cc ||
-           !tcpc->set_polarity || !tcpc->set_vconn || !tcpc->set_vbus ||
-           !tcpc->set_pd_rx || !tcpc->set_roles || !tcpc->pd_transmit)
-               return ERR_PTR(-EINVAL);
-
-       port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL);
-       if (!port)
-               return ERR_PTR(-ENOMEM);
-
-       port->dev = dev;
-       port->tcpc = tcpc;
-
-       mutex_init(&port->lock);
-       mutex_init(&port->swap_lock);
-
-       port->wq = create_singlethread_workqueue(dev_name(dev));
-       if (!port->wq)
-               return ERR_PTR(-ENOMEM);
-       INIT_DELAYED_WORK(&port->state_machine, tcpm_state_machine_work);
-       INIT_DELAYED_WORK(&port->vdm_state_machine, vdm_state_machine_work);
-       INIT_WORK(&port->event_work, tcpm_pd_event_handler);
-
-       spin_lock_init(&port->pd_event_lock);
-
-       init_completion(&port->tx_complete);
-       init_completion(&port->swap_complete);
-       init_completion(&port->pps_complete);
-       tcpm_debugfs_init(port);
-
-       err = tcpm_fw_get_caps(port, tcpc->fwnode);
-       if ((err < 0) && tcpc->config)
-               err = tcpm_copy_caps(port, tcpc->config);
-       if (err < 0)
-               goto out_destroy_wq;
-
-       if (!tcpc->config || !tcpc->config->try_role_hw)
-               port->try_role = port->typec_caps.prefer_role;
-       else
-               port->try_role = TYPEC_NO_PREFERRED_ROLE;
-
-       port->typec_caps.fwnode = tcpc->fwnode;
-       port->typec_caps.revision = 0x0120;     /* Type-C spec release 1.2 */
-       port->typec_caps.pd_revision = 0x0300;  /* USB-PD spec release 3.0 */
-       port->typec_caps.dr_set = tcpm_dr_set;
-       port->typec_caps.pr_set = tcpm_pr_set;
-       port->typec_caps.vconn_set = tcpm_vconn_set;
-       port->typec_caps.try_role = tcpm_try_role;
-       port->typec_caps.port_type_set = tcpm_port_type_set;
-
-       port->partner_desc.identity = &port->partner_ident;
-       port->port_type = port->typec_caps.type;
-
-       port->role_sw = usb_role_switch_get(port->dev);
-       if (IS_ERR(port->role_sw)) {
-               err = PTR_ERR(port->role_sw);
-               goto out_destroy_wq;
-       }
-
-       err = devm_tcpm_psy_register(port);
-       if (err)
-               goto out_destroy_wq;
-
-       port->typec_port = typec_register_port(port->dev, &port->typec_caps);
-       if (IS_ERR(port->typec_port)) {
-               err = PTR_ERR(port->typec_port);
-               goto out_destroy_wq;
-       }
-
-       if (tcpc->config && tcpc->config->alt_modes) {
-               const struct typec_altmode_desc *paltmode = tcpc->config->alt_modes;
-
-               i = 0;
-               while (paltmode->svid && i < ARRAY_SIZE(port->port_altmode)) {
-                       struct typec_altmode *alt;
-
-                       alt = typec_port_register_altmode(port->typec_port,
-                                                         paltmode);
-                       if (IS_ERR(alt)) {
-                               tcpm_log(port,
-                                        "%s: failed to register port alternate mode 0x%x",
-                                        dev_name(dev), paltmode->svid);
-                               break;
-                       }
-                       typec_altmode_set_drvdata(alt, port);
-                       alt->ops = &tcpm_altmode_ops;
-                       port->port_altmode[i] = alt;
-                       i++;
-                       paltmode++;
-               }
-       }
-
-       mutex_lock(&port->lock);
-       tcpm_init(port);
-       mutex_unlock(&port->lock);
-
-       tcpm_log(port, "%s: registered", dev_name(dev));
-       return port;
-
-out_destroy_wq:
-       usb_role_switch_put(port->role_sw);
-       destroy_workqueue(port->wq);
-       return ERR_PTR(err);
-}
-EXPORT_SYMBOL_GPL(tcpm_register_port);
-
-void tcpm_unregister_port(struct tcpm_port *port)
-{
-       int i;
-
-       tcpm_reset_port(port);
-       for (i = 0; i < ARRAY_SIZE(port->port_altmode); i++)
-               typec_unregister_altmode(port->port_altmode[i]);
-       typec_unregister_port(port->typec_port);
-       usb_role_switch_put(port->role_sw);
-       tcpm_debugfs_exit(port);
-       destroy_workqueue(port->wq);
-}
-EXPORT_SYMBOL_GPL(tcpm_unregister_port);
-
-MODULE_AUTHOR("Guenter Roeck <groeck@chromium.org>");
-MODULE_DESCRIPTION("USB Type-C Port Manager");
-MODULE_LICENSE("GPL");
diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig
new file mode 100644 (file)
index 0000000..f03ea8a
--- /dev/null
@@ -0,0 +1,52 @@
+config TYPEC_TCPM
+       tristate "USB Type-C Port Controller Manager"
+       depends on USB
+       select USB_ROLE_SWITCH
+       select POWER_SUPPLY
+       help
+         The Type-C Port Controller Manager provides a USB PD and USB Type-C
+         state machine for use with Type-C Port Controllers.
+
+if TYPEC_TCPM
+
+config TYPEC_TCPCI
+       tristate "Type-C Port Controller Interface driver"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         Type-C Port Controller driver for TCPCI-compliant controller.
+
+if TYPEC_TCPCI
+
+config TYPEC_RT1711H
+       tristate "Richtek RT1711H Type-C chip driver"
+       help
+         Richtek RT1711H Type-C chip driver that works with
+         Type-C Port Controller Manager to provide USB PD and USB
+         Type-C functionalities.
+
+endif # TYPEC_TCPCI
+
+config TYPEC_FUSB302
+       tristate "Fairchild FUSB302 Type-C chip driver"
+       depends on I2C
+       help
+         The Fairchild FUSB302 Type-C chip driver that works with
+         Type-C Port Controller Manager to provide USB PD and USB
+         Type-C functionalities.
+
+config TYPEC_WCOVE
+       tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
+       depends on ACPI
+       depends on INTEL_SOC_PMIC
+       depends on INTEL_PMC_IPC
+       depends on BXT_WC_PMIC_OPREGION
+       help
+         This driver adds support for USB Type-C on Intel Broxton platforms
+         that have Intel Whiskey Cove PMIC. The driver works with USB Type-C
+         Port Controller Manager to provide USB PD and Type-C functionalities.
+
+         To compile this driver as module, choose M here: the module will be
+         called typec_wcove.ko
+
+endif # TYPEC_TCPM
diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile
new file mode 100644 (file)
index 0000000..a5ff6c8
--- /dev/null
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_TYPEC_TCPM)       += tcpm.o
+obj-$(CONFIG_TYPEC_FUSB302)    += fusb302.o
+obj-$(CONFIG_TYPEC_WCOVE)      += typec_wcove.o
+typec_wcove-y                  := wcove.o
+obj-$(CONFIG_TYPEC_TCPCI)      += tcpci.o
+obj-$(CONFIG_TYPEC_RT1711H)    += tcpci_rt1711h.o
diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
new file mode 100644 (file)
index 0000000..6e9370a
--- /dev/null
@@ -0,0 +1,1861 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2016-2017 Google, Inc
+ *
+ * Fairchild FUSB302 Type-C Chip Driver
+ */
+
+#include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/extcon.h>
+#include <linux/gpio.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/proc_fs.h>
+#include <linux/regulator/consumer.h>
+#include <linux/sched/clock.h>
+#include <linux/seq_file.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/usb/typec.h>
+#include <linux/usb/tcpm.h>
+#include <linux/usb/pd.h>
+#include <linux/workqueue.h>
+
+#include "fusb302_reg.h"
+
+/*
+ * When the device is SNK, BC_LVL interrupt is used to monitor cc pins
+ * for the current capability offered by the SRC. As FUSB302 chip fires
+ * the BC_LVL interrupt on PD signalings, cc lvl should be handled after
+ * a delay to avoid measuring on PD activities. The delay is slightly
+ * longer than PD_T_PD_DEBPUNCE (10-20ms).
+ */
+#define T_BC_LVL_DEBOUNCE_DELAY_MS 30
+
+enum toggling_mode {
+       TOGGLINE_MODE_OFF,
+       TOGGLING_MODE_DRP,
+       TOGGLING_MODE_SNK,
+       TOGGLING_MODE_SRC,
+};
+
+enum src_current_status {
+       SRC_CURRENT_DEFAULT,
+       SRC_CURRENT_MEDIUM,
+       SRC_CURRENT_HIGH,
+};
+
+static const u8 ra_mda_value[] = {
+       [SRC_CURRENT_DEFAULT] = 4,      /* 210mV */
+       [SRC_CURRENT_MEDIUM] = 9,       /* 420mV */
+       [SRC_CURRENT_HIGH] = 18,        /* 798mV */
+};
+
+static const u8 rd_mda_value[] = {
+       [SRC_CURRENT_DEFAULT] = 38,     /* 1638mV */
+       [SRC_CURRENT_MEDIUM] = 38,      /* 1638mV */
+       [SRC_CURRENT_HIGH] = 61,        /* 2604mV */
+};
+
+#define LOG_BUFFER_ENTRIES     1024
+#define LOG_BUFFER_ENTRY_SIZE  128
+
+struct fusb302_chip {
+       struct device *dev;
+       struct i2c_client *i2c_client;
+       struct tcpm_port *tcpm_port;
+       struct tcpc_dev tcpc_dev;
+       struct tcpc_config tcpc_config;
+
+       struct regulator *vbus;
+
+       int gpio_int_n;
+       int gpio_int_n_irq;
+       struct extcon_dev *extcon;
+
+       struct workqueue_struct *wq;
+       struct delayed_work bc_lvl_handler;
+
+       atomic_t pm_suspend;
+       atomic_t i2c_busy;
+
+       /* lock for sharing chip states */
+       struct mutex lock;
+
+       /* chip status */
+       enum toggling_mode toggling_mode;
+       enum src_current_status src_current_status;
+       bool intr_togdone;
+       bool intr_bc_lvl;
+       bool intr_comp_chng;
+
+       /* port status */
+       bool pull_up;
+       bool vconn_on;
+       bool vbus_on;
+       bool charge_on;
+       bool vbus_present;
+       enum typec_cc_polarity cc_polarity;
+       enum typec_cc_status cc1;
+       enum typec_cc_status cc2;
+       u32 snk_pdo[PDO_MAX_OBJECTS];
+
+#ifdef CONFIG_DEBUG_FS
+       struct dentry *dentry;
+       /* lock for log buffer access */
+       struct mutex logbuffer_lock;
+       int logbuffer_head;
+       int logbuffer_tail;
+       u8 *logbuffer[LOG_BUFFER_ENTRIES];
+#endif
+};
+
+/*
+ * Logging
+ */
+
+#ifdef CONFIG_DEBUG_FS
+
+static bool fusb302_log_full(struct fusb302_chip *chip)
+{
+       return chip->logbuffer_tail ==
+               (chip->logbuffer_head + 1) % LOG_BUFFER_ENTRIES;
+}
+
+static void _fusb302_log(struct fusb302_chip *chip, const char *fmt,
+                        va_list args)
+{
+       char tmpbuffer[LOG_BUFFER_ENTRY_SIZE];
+       u64 ts_nsec = local_clock();
+       unsigned long rem_nsec;
+
+       if (!chip->logbuffer[chip->logbuffer_head]) {
+               chip->logbuffer[chip->logbuffer_head] =
+                               kzalloc(LOG_BUFFER_ENTRY_SIZE, GFP_KERNEL);
+               if (!chip->logbuffer[chip->logbuffer_head])
+                       return;
+       }
+
+       vsnprintf(tmpbuffer, sizeof(tmpbuffer), fmt, args);
+
+       mutex_lock(&chip->logbuffer_lock);
+
+       if (fusb302_log_full(chip)) {
+               chip->logbuffer_head = max(chip->logbuffer_head - 1, 0);
+               strlcpy(tmpbuffer, "overflow", sizeof(tmpbuffer));
+       }
+
+       if (chip->logbuffer_head < 0 ||
+           chip->logbuffer_head >= LOG_BUFFER_ENTRIES) {
+               dev_warn(chip->dev,
+                        "Bad log buffer index %d\n", chip->logbuffer_head);
+               goto abort;
+       }
+
+       if (!chip->logbuffer[chip->logbuffer_head]) {
+               dev_warn(chip->dev,
+                        "Log buffer index %d is NULL\n", chip->logbuffer_head);
+               goto abort;
+       }
+
+       rem_nsec = do_div(ts_nsec, 1000000000);
+       scnprintf(chip->logbuffer[chip->logbuffer_head],
+                 LOG_BUFFER_ENTRY_SIZE, "[%5lu.%06lu] %s",
+                 (unsigned long)ts_nsec, rem_nsec / 1000,
+                 tmpbuffer);
+       chip->logbuffer_head = (chip->logbuffer_head + 1) % LOG_BUFFER_ENTRIES;
+
+abort:
+       mutex_unlock(&chip->logbuffer_lock);
+}
+
+static void fusb302_log(struct fusb302_chip *chip, const char *fmt, ...)
+{
+       va_list args;
+
+       va_start(args, fmt);
+       _fusb302_log(chip, fmt, args);
+       va_end(args);
+}
+
+static int fusb302_debug_show(struct seq_file *s, void *v)
+{
+       struct fusb302_chip *chip = (struct fusb302_chip *)s->private;
+       int tail;
+
+       mutex_lock(&chip->logbuffer_lock);
+       tail = chip->logbuffer_tail;
+       while (tail != chip->logbuffer_head) {
+               seq_printf(s, "%s\n", chip->logbuffer[tail]);
+               tail = (tail + 1) % LOG_BUFFER_ENTRIES;
+       }
+       if (!seq_has_overflowed(s))
+               chip->logbuffer_tail = tail;
+       mutex_unlock(&chip->logbuffer_lock);
+
+       return 0;
+}
+DEFINE_SHOW_ATTRIBUTE(fusb302_debug);
+
+static struct dentry *rootdir;
+
+static void fusb302_debugfs_init(struct fusb302_chip *chip)
+{
+       mutex_init(&chip->logbuffer_lock);
+       if (!rootdir)
+               rootdir = debugfs_create_dir("fusb302", NULL);
+
+       chip->dentry = debugfs_create_file(dev_name(chip->dev),
+                                          S_IFREG | 0444, rootdir,
+                                          chip, &fusb302_debug_fops);
+}
+
+static void fusb302_debugfs_exit(struct fusb302_chip *chip)
+{
+       debugfs_remove(chip->dentry);
+       debugfs_remove(rootdir);
+}
+
+#else
+
+static void fusb302_log(const struct fusb302_chip *chip,
+                       const char *fmt, ...) { }
+static void fusb302_debugfs_init(const struct fusb302_chip *chip) { }
+static void fusb302_debugfs_exit(const struct fusb302_chip *chip) { }
+
+#endif
+
+#define FUSB302_RESUME_RETRY 10
+#define FUSB302_RESUME_RETRY_SLEEP 50
+
+static bool fusb302_is_suspended(struct fusb302_chip *chip)
+{
+       int retry_cnt;
+
+       for (retry_cnt = 0; retry_cnt < FUSB302_RESUME_RETRY; retry_cnt++) {
+               if (atomic_read(&chip->pm_suspend)) {
+                       dev_err(chip->dev, "i2c: pm suspend, retry %d/%d\n",
+                               retry_cnt + 1, FUSB302_RESUME_RETRY);
+                       msleep(FUSB302_RESUME_RETRY_SLEEP);
+               } else {
+                       return false;
+               }
+       }
+
+       return true;
+}
+
+static int fusb302_i2c_write(struct fusb302_chip *chip,
+                            u8 address, u8 data)
+{
+       int ret = 0;
+
+       atomic_set(&chip->i2c_busy, 1);
+
+       if (fusb302_is_suspended(chip)) {
+               atomic_set(&chip->i2c_busy, 0);
+               return -ETIMEDOUT;
+       }
+
+       ret = i2c_smbus_write_byte_data(chip->i2c_client, address, data);
+       if (ret < 0)
+               fusb302_log(chip, "cannot write 0x%02x to 0x%02x, ret=%d",
+                           data, address, ret);
+       atomic_set(&chip->i2c_busy, 0);
+
+       return ret;
+}
+
+static int fusb302_i2c_block_write(struct fusb302_chip *chip, u8 address,
+                                  u8 length, const u8 *data)
+{
+       int ret = 0;
+
+       if (length <= 0)
+               return ret;
+       atomic_set(&chip->i2c_busy, 1);
+
+       if (fusb302_is_suspended(chip)) {
+               atomic_set(&chip->i2c_busy, 0);
+               return -ETIMEDOUT;
+       }
+
+       ret = i2c_smbus_write_i2c_block_data(chip->i2c_client, address,
+                                            length, data);
+       if (ret < 0)
+               fusb302_log(chip, "cannot block write 0x%02x, len=%d, ret=%d",
+                           address, length, ret);
+       atomic_set(&chip->i2c_busy, 0);
+
+       return ret;
+}
+
+static int fusb302_i2c_read(struct fusb302_chip *chip,
+                           u8 address, u8 *data)
+{
+       int ret = 0;
+
+       atomic_set(&chip->i2c_busy, 1);
+
+       if (fusb302_is_suspended(chip)) {
+               atomic_set(&chip->i2c_busy, 0);
+               return -ETIMEDOUT;
+       }
+
+       ret = i2c_smbus_read_byte_data(chip->i2c_client, address);
+       *data = (u8)ret;
+       if (ret < 0)
+               fusb302_log(chip, "cannot read %02x, ret=%d", address, ret);
+       atomic_set(&chip->i2c_busy, 0);
+
+       return ret;
+}
+
+static int fusb302_i2c_block_read(struct fusb302_chip *chip, u8 address,
+                                 u8 length, u8 *data)
+{
+       int ret = 0;
+
+       if (length <= 0)
+               return ret;
+       atomic_set(&chip->i2c_busy, 1);
+
+       if (fusb302_is_suspended(chip)) {
+               atomic_set(&chip->i2c_busy, 0);
+               return -ETIMEDOUT;
+       }
+
+       ret = i2c_smbus_read_i2c_block_data(chip->i2c_client, address,
+                                           length, data);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot block read 0x%02x, len=%d, ret=%d",
+                           address, length, ret);
+               goto done;
+       }
+       if (ret != length) {
+               fusb302_log(chip, "only read %d/%d bytes from 0x%02x",
+                           ret, length, address);
+               ret = -EIO;
+       }
+
+done:
+       atomic_set(&chip->i2c_busy, 0);
+
+       return ret;
+}
+
+static int fusb302_i2c_mask_write(struct fusb302_chip *chip, u8 address,
+                                 u8 mask, u8 value)
+{
+       int ret = 0;
+       u8 data;
+
+       ret = fusb302_i2c_read(chip, address, &data);
+       if (ret < 0)
+               return ret;
+       data &= ~mask;
+       data |= value;
+       ret = fusb302_i2c_write(chip, address, data);
+       if (ret < 0)
+               return ret;
+
+       return ret;
+}
+
+static int fusb302_i2c_set_bits(struct fusb302_chip *chip, u8 address,
+                               u8 set_bits)
+{
+       return fusb302_i2c_mask_write(chip, address, 0x00, set_bits);
+}
+
+static int fusb302_i2c_clear_bits(struct fusb302_chip *chip, u8 address,
+                                 u8 clear_bits)
+{
+       return fusb302_i2c_mask_write(chip, address, clear_bits, 0x00);
+}
+
+static int fusb302_sw_reset(struct fusb302_chip *chip)
+{
+       int ret = 0;
+
+       ret = fusb302_i2c_write(chip, FUSB_REG_RESET,
+                               FUSB_REG_RESET_SW_RESET);
+       if (ret < 0)
+               fusb302_log(chip, "cannot sw reset the chip, ret=%d", ret);
+       else
+               fusb302_log(chip, "sw reset");
+
+       return ret;
+}
+
+static int fusb302_enable_tx_auto_retries(struct fusb302_chip *chip)
+{
+       int ret = 0;
+
+       ret = fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL3,
+                                  FUSB_REG_CONTROL3_N_RETRIES_3 |
+                                  FUSB_REG_CONTROL3_AUTO_RETRY);
+
+       return ret;
+}
+
+/*
+ * initialize interrupt on the chip
+ * - unmasked interrupt: VBUS_OK
+ */
+static int fusb302_init_interrupt(struct fusb302_chip *chip)
+{
+       int ret = 0;
+
+       ret = fusb302_i2c_write(chip, FUSB_REG_MASK,
+                               0xFF & ~FUSB_REG_MASK_VBUSOK);
+       if (ret < 0)
+               return ret;
+       ret = fusb302_i2c_write(chip, FUSB_REG_MASKA, 0xFF);
+       if (ret < 0)
+               return ret;
+       ret = fusb302_i2c_write(chip, FUSB_REG_MASKB, 0xFF);
+       if (ret < 0)
+               return ret;
+       ret = fusb302_i2c_clear_bits(chip, FUSB_REG_CONTROL0,
+                                    FUSB_REG_CONTROL0_INT_MASK);
+       if (ret < 0)
+               return ret;
+
+       return ret;
+}
+
+static int fusb302_set_power_mode(struct fusb302_chip *chip, u8 power_mode)
+{
+       int ret = 0;
+
+       ret = fusb302_i2c_write(chip, FUSB_REG_POWER, power_mode);
+
+       return ret;
+}
+
+static int tcpm_init(struct tcpc_dev *dev)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int ret = 0;
+       u8 data;
+
+       ret = fusb302_sw_reset(chip);
+       if (ret < 0)
+               return ret;
+       ret = fusb302_enable_tx_auto_retries(chip);
+       if (ret < 0)
+               return ret;
+       ret = fusb302_init_interrupt(chip);
+       if (ret < 0)
+               return ret;
+       ret = fusb302_set_power_mode(chip, FUSB_REG_POWER_PWR_ALL);
+       if (ret < 0)
+               return ret;
+       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &data);
+       if (ret < 0)
+               return ret;
+       chip->vbus_present = !!(data & FUSB_REG_STATUS0_VBUSOK);
+       ret = fusb302_i2c_read(chip, FUSB_REG_DEVICE_ID, &data);
+       if (ret < 0)
+               return ret;
+       fusb302_log(chip, "fusb302 device ID: 0x%02x", data);
+
+       return ret;
+}
+
+static int tcpm_get_vbus(struct tcpc_dev *dev)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int ret = 0;
+
+       mutex_lock(&chip->lock);
+       ret = chip->vbus_present ? 1 : 0;
+       mutex_unlock(&chip->lock);
+
+       return ret;
+}
+
+static int tcpm_get_current_limit(struct tcpc_dev *dev)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int current_limit = 0;
+       unsigned long timeout;
+
+       if (!chip->extcon)
+               return 0;
+
+       /*
+        * USB2 Charger detection may still be in progress when we get here,
+        * this can take upto 600ms, wait 800ms max.
+        */
+       timeout = jiffies + msecs_to_jiffies(800);
+       do {
+               if (extcon_get_state(chip->extcon, EXTCON_CHG_USB_SDP) == 1)
+                       current_limit = 500;
+
+               if (extcon_get_state(chip->extcon, EXTCON_CHG_USB_CDP) == 1 ||
+                   extcon_get_state(chip->extcon, EXTCON_CHG_USB_ACA) == 1)
+                       current_limit = 1500;
+
+               if (extcon_get_state(chip->extcon, EXTCON_CHG_USB_DCP) == 1)
+                       current_limit = 2000;
+
+               msleep(50);
+       } while (current_limit == 0 && time_before(jiffies, timeout));
+
+       return current_limit;
+}
+
+static int fusb302_set_cc_pull(struct fusb302_chip *chip,
+                              bool pull_up, bool pull_down)
+{
+       int ret = 0;
+       u8 data = 0x00;
+       u8 mask = FUSB_REG_SWITCHES0_CC1_PU_EN |
+                 FUSB_REG_SWITCHES0_CC2_PU_EN |
+                 FUSB_REG_SWITCHES0_CC1_PD_EN |
+                 FUSB_REG_SWITCHES0_CC2_PD_EN;
+
+       if (pull_up)
+               data |= (chip->cc_polarity == TYPEC_POLARITY_CC1) ?
+                       FUSB_REG_SWITCHES0_CC1_PU_EN :
+                       FUSB_REG_SWITCHES0_CC2_PU_EN;
+       if (pull_down)
+               data |= FUSB_REG_SWITCHES0_CC1_PD_EN |
+                       FUSB_REG_SWITCHES0_CC2_PD_EN;
+       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0,
+                                    mask, data);
+       if (ret < 0)
+               return ret;
+       chip->pull_up = pull_up;
+
+       return ret;
+}
+
+static int fusb302_set_src_current(struct fusb302_chip *chip,
+                                  enum src_current_status status)
+{
+       int ret = 0;
+
+       chip->src_current_status = status;
+       switch (status) {
+       case SRC_CURRENT_DEFAULT:
+               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL0,
+                                            FUSB_REG_CONTROL0_HOST_CUR_MASK,
+                                            FUSB_REG_CONTROL0_HOST_CUR_DEF);
+               break;
+       case SRC_CURRENT_MEDIUM:
+               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL0,
+                                            FUSB_REG_CONTROL0_HOST_CUR_MASK,
+                                            FUSB_REG_CONTROL0_HOST_CUR_MED);
+               break;
+       case SRC_CURRENT_HIGH:
+               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL0,
+                                            FUSB_REG_CONTROL0_HOST_CUR_MASK,
+                                            FUSB_REG_CONTROL0_HOST_CUR_HIGH);
+               break;
+       default:
+               break;
+       }
+
+       return ret;
+}
+
+static int fusb302_set_toggling(struct fusb302_chip *chip,
+                               enum toggling_mode mode)
+{
+       int ret = 0;
+
+       /* first disable toggling */
+       ret = fusb302_i2c_clear_bits(chip, FUSB_REG_CONTROL2,
+                                    FUSB_REG_CONTROL2_TOGGLE);
+       if (ret < 0)
+               return ret;
+       /* mask interrupts for SRC or SNK */
+       ret = fusb302_i2c_set_bits(chip, FUSB_REG_MASK,
+                                  FUSB_REG_MASK_BC_LVL |
+                                  FUSB_REG_MASK_COMP_CHNG);
+       if (ret < 0)
+               return ret;
+       chip->intr_bc_lvl = false;
+       chip->intr_comp_chng = false;
+       /* configure toggling mode: none/snk/src/drp */
+       switch (mode) {
+       case TOGGLINE_MODE_OFF:
+               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL2,
+                                            FUSB_REG_CONTROL2_MODE_MASK,
+                                            FUSB_REG_CONTROL2_MODE_NONE);
+               if (ret < 0)
+                       return ret;
+               break;
+       case TOGGLING_MODE_SNK:
+               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL2,
+                                            FUSB_REG_CONTROL2_MODE_MASK,
+                                            FUSB_REG_CONTROL2_MODE_UFP);
+               if (ret < 0)
+                       return ret;
+               break;
+       case TOGGLING_MODE_SRC:
+               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL2,
+                                            FUSB_REG_CONTROL2_MODE_MASK,
+                                            FUSB_REG_CONTROL2_MODE_DFP);
+               if (ret < 0)
+                       return ret;
+               break;
+       case TOGGLING_MODE_DRP:
+               ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL2,
+                                            FUSB_REG_CONTROL2_MODE_MASK,
+                                            FUSB_REG_CONTROL2_MODE_DRP);
+               if (ret < 0)
+                       return ret;
+               break;
+       default:
+               break;
+       }
+
+       if (mode == TOGGLINE_MODE_OFF) {
+               /* mask TOGDONE interrupt */
+               ret = fusb302_i2c_set_bits(chip, FUSB_REG_MASKA,
+                                          FUSB_REG_MASKA_TOGDONE);
+               if (ret < 0)
+                       return ret;
+               chip->intr_togdone = false;
+       } else {
+               /* unmask TOGDONE interrupt */
+               ret = fusb302_i2c_clear_bits(chip, FUSB_REG_MASKA,
+                                            FUSB_REG_MASKA_TOGDONE);
+               if (ret < 0)
+                       return ret;
+               chip->intr_togdone = true;
+               /* start toggling */
+               ret = fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL2,
+                                          FUSB_REG_CONTROL2_TOGGLE);
+               if (ret < 0)
+                       return ret;
+               /* during toggling, consider cc as Open */
+               chip->cc1 = TYPEC_CC_OPEN;
+               chip->cc2 = TYPEC_CC_OPEN;
+       }
+       chip->toggling_mode = mode;
+
+       return ret;
+}
+
+static const char * const typec_cc_status_name[] = {
+       [TYPEC_CC_OPEN]         = "Open",
+       [TYPEC_CC_RA]           = "Ra",
+       [TYPEC_CC_RD]           = "Rd",
+       [TYPEC_CC_RP_DEF]       = "Rp-def",
+       [TYPEC_CC_RP_1_5]       = "Rp-1.5",
+       [TYPEC_CC_RP_3_0]       = "Rp-3.0",
+};
+
+static const enum src_current_status cc_src_current[] = {
+       [TYPEC_CC_OPEN]         = SRC_CURRENT_DEFAULT,
+       [TYPEC_CC_RA]           = SRC_CURRENT_DEFAULT,
+       [TYPEC_CC_RD]           = SRC_CURRENT_DEFAULT,
+       [TYPEC_CC_RP_DEF]       = SRC_CURRENT_DEFAULT,
+       [TYPEC_CC_RP_1_5]       = SRC_CURRENT_MEDIUM,
+       [TYPEC_CC_RP_3_0]       = SRC_CURRENT_HIGH,
+};
+
+static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int ret = 0;
+       bool pull_up, pull_down;
+       u8 rd_mda;
+
+       mutex_lock(&chip->lock);
+       switch (cc) {
+       case TYPEC_CC_OPEN:
+               pull_up = false;
+               pull_down = false;
+               break;
+       case TYPEC_CC_RD:
+               pull_up = false;
+               pull_down = true;
+               break;
+       case TYPEC_CC_RP_DEF:
+       case TYPEC_CC_RP_1_5:
+       case TYPEC_CC_RP_3_0:
+               pull_up = true;
+               pull_down = false;
+               break;
+       default:
+               fusb302_log(chip, "unsupported cc value %s",
+                           typec_cc_status_name[cc]);
+               ret = -EINVAL;
+               goto done;
+       }
+       ret = fusb302_set_toggling(chip, TOGGLINE_MODE_OFF);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot stop toggling, ret=%d", ret);
+               goto done;
+       }
+       ret = fusb302_set_cc_pull(chip, pull_up, pull_down);
+       if (ret < 0) {
+               fusb302_log(chip,
+                           "cannot set cc pulling up %s, down %s, ret = %d",
+                           pull_up ? "True" : "False",
+                           pull_down ? "True" : "False",
+                           ret);
+               goto done;
+       }
+       /* reset the cc status */
+       chip->cc1 = TYPEC_CC_OPEN;
+       chip->cc2 = TYPEC_CC_OPEN;
+       /* adjust current for SRC */
+       if (pull_up) {
+               ret = fusb302_set_src_current(chip, cc_src_current[cc]);
+               if (ret < 0) {
+                       fusb302_log(chip, "cannot set src current %s, ret=%d",
+                                   typec_cc_status_name[cc], ret);
+                       goto done;
+               }
+       }
+       /* enable/disable interrupts, BC_LVL for SNK and COMP_CHNG for SRC */
+       if (pull_up) {
+               rd_mda = rd_mda_value[cc_src_current[cc]];
+               ret = fusb302_i2c_write(chip, FUSB_REG_MEASURE, rd_mda);
+               if (ret < 0) {
+                       fusb302_log(chip,
+                                   "cannot set SRC measure value, ret=%d",
+                                   ret);
+                       goto done;
+               }
+               ret = fusb302_i2c_mask_write(chip, FUSB_REG_MASK,
+                                            FUSB_REG_MASK_BC_LVL |
+                                            FUSB_REG_MASK_COMP_CHNG,
+                                            FUSB_REG_MASK_COMP_CHNG);
+               if (ret < 0) {
+                       fusb302_log(chip, "cannot set SRC interrupt, ret=%d",
+                                   ret);
+                       goto done;
+               }
+               chip->intr_bc_lvl = false;
+               chip->intr_comp_chng = true;
+       }
+       if (pull_down) {
+               ret = fusb302_i2c_mask_write(chip, FUSB_REG_MASK,
+                                            FUSB_REG_MASK_BC_LVL |
+                                            FUSB_REG_MASK_COMP_CHNG,
+                                            FUSB_REG_MASK_BC_LVL);
+               if (ret < 0) {
+                       fusb302_log(chip, "cannot set SRC interrupt, ret=%d",
+                                   ret);
+                       goto done;
+               }
+               chip->intr_bc_lvl = true;
+               chip->intr_comp_chng = false;
+       }
+       fusb302_log(chip, "cc := %s", typec_cc_status_name[cc]);
+done:
+       mutex_unlock(&chip->lock);
+
+       return ret;
+}
+
+static int tcpm_get_cc(struct tcpc_dev *dev, enum typec_cc_status *cc1,
+                      enum typec_cc_status *cc2)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+
+       mutex_lock(&chip->lock);
+       *cc1 = chip->cc1;
+       *cc2 = chip->cc2;
+       fusb302_log(chip, "cc1=%s, cc2=%s", typec_cc_status_name[*cc1],
+                   typec_cc_status_name[*cc2]);
+       mutex_unlock(&chip->lock);
+
+       return 0;
+}
+
+static int tcpm_set_polarity(struct tcpc_dev *dev,
+                            enum typec_cc_polarity polarity)
+{
+       return 0;
+}
+
+static int tcpm_set_vconn(struct tcpc_dev *dev, bool on)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int ret = 0;
+       u8 switches0_data = 0x00;
+       u8 switches0_mask = FUSB_REG_SWITCHES0_VCONN_CC1 |
+                           FUSB_REG_SWITCHES0_VCONN_CC2;
+
+       mutex_lock(&chip->lock);
+       if (chip->vconn_on == on) {
+               fusb302_log(chip, "vconn is already %s", on ? "On" : "Off");
+               goto done;
+       }
+       if (on) {
+               switches0_data = (chip->cc_polarity == TYPEC_POLARITY_CC1) ?
+                                FUSB_REG_SWITCHES0_VCONN_CC2 :
+                                FUSB_REG_SWITCHES0_VCONN_CC1;
+       }
+       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0,
+                                    switches0_mask, switches0_data);
+       if (ret < 0)
+               goto done;
+       chip->vconn_on = on;
+       fusb302_log(chip, "vconn := %s", on ? "On" : "Off");
+done:
+       mutex_unlock(&chip->lock);
+
+       return ret;
+}
+
+static int tcpm_set_vbus(struct tcpc_dev *dev, bool on, bool charge)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int ret = 0;
+
+       mutex_lock(&chip->lock);
+       if (chip->vbus_on == on) {
+               fusb302_log(chip, "vbus is already %s", on ? "On" : "Off");
+       } else {
+               if (on)
+                       ret = regulator_enable(chip->vbus);
+               else
+                       ret = regulator_disable(chip->vbus);
+               if (ret < 0) {
+                       fusb302_log(chip, "cannot %s vbus regulator, ret=%d",
+                                   on ? "enable" : "disable", ret);
+                       goto done;
+               }
+               chip->vbus_on = on;
+               fusb302_log(chip, "vbus := %s", on ? "On" : "Off");
+       }
+       if (chip->charge_on == charge)
+               fusb302_log(chip, "charge is already %s",
+                           charge ? "On" : "Off");
+       else
+               chip->charge_on = charge;
+
+done:
+       mutex_unlock(&chip->lock);
+
+       return ret;
+}
+
+static int fusb302_pd_tx_flush(struct fusb302_chip *chip)
+{
+       return fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL0,
+                                   FUSB_REG_CONTROL0_TX_FLUSH);
+}
+
+static int fusb302_pd_rx_flush(struct fusb302_chip *chip)
+{
+       return fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL1,
+                                   FUSB_REG_CONTROL1_RX_FLUSH);
+}
+
+static int fusb302_pd_set_auto_goodcrc(struct fusb302_chip *chip, bool on)
+{
+       if (on)
+               return fusb302_i2c_set_bits(chip, FUSB_REG_SWITCHES1,
+                                           FUSB_REG_SWITCHES1_AUTO_GCRC);
+       return fusb302_i2c_clear_bits(chip, FUSB_REG_SWITCHES1,
+                                           FUSB_REG_SWITCHES1_AUTO_GCRC);
+}
+
+static int fusb302_pd_set_interrupts(struct fusb302_chip *chip, bool on)
+{
+       int ret = 0;
+       u8 mask_interrupts = FUSB_REG_MASK_COLLISION;
+       u8 maska_interrupts = FUSB_REG_MASKA_RETRYFAIL |
+                             FUSB_REG_MASKA_HARDSENT |
+                             FUSB_REG_MASKA_TX_SUCCESS |
+                             FUSB_REG_MASKA_HARDRESET;
+       u8 maskb_interrupts = FUSB_REG_MASKB_GCRCSENT;
+
+       ret = on ?
+               fusb302_i2c_clear_bits(chip, FUSB_REG_MASK, mask_interrupts) :
+               fusb302_i2c_set_bits(chip, FUSB_REG_MASK, mask_interrupts);
+       if (ret < 0)
+               return ret;
+       ret = on ?
+               fusb302_i2c_clear_bits(chip, FUSB_REG_MASKA, maska_interrupts) :
+               fusb302_i2c_set_bits(chip, FUSB_REG_MASKA, maska_interrupts);
+       if (ret < 0)
+               return ret;
+       ret = on ?
+               fusb302_i2c_clear_bits(chip, FUSB_REG_MASKB, maskb_interrupts) :
+               fusb302_i2c_set_bits(chip, FUSB_REG_MASKB, maskb_interrupts);
+       return ret;
+}
+
+static int tcpm_set_pd_rx(struct tcpc_dev *dev, bool on)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int ret = 0;
+
+       mutex_lock(&chip->lock);
+       ret = fusb302_pd_rx_flush(chip);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot flush pd rx buffer, ret=%d", ret);
+               goto done;
+       }
+       ret = fusb302_pd_tx_flush(chip);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot flush pd tx buffer, ret=%d", ret);
+               goto done;
+       }
+       ret = fusb302_pd_set_auto_goodcrc(chip, on);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot turn %s auto GCRC, ret=%d",
+                           on ? "on" : "off", ret);
+               goto done;
+       }
+       ret = fusb302_pd_set_interrupts(chip, on);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot turn %s pd interrupts, ret=%d",
+                           on ? "on" : "off", ret);
+               goto done;
+       }
+       fusb302_log(chip, "pd := %s", on ? "on" : "off");
+done:
+       mutex_unlock(&chip->lock);
+
+       return ret;
+}
+
+static const char * const typec_role_name[] = {
+       [TYPEC_SINK]            = "Sink",
+       [TYPEC_SOURCE]          = "Source",
+};
+
+static const char * const typec_data_role_name[] = {
+       [TYPEC_DEVICE]          = "Device",
+       [TYPEC_HOST]            = "Host",
+};
+
+static int tcpm_set_roles(struct tcpc_dev *dev, bool attached,
+                         enum typec_role pwr, enum typec_data_role data)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int ret = 0;
+       u8 switches1_mask = FUSB_REG_SWITCHES1_POWERROLE |
+                           FUSB_REG_SWITCHES1_DATAROLE;
+       u8 switches1_data = 0x00;
+
+       mutex_lock(&chip->lock);
+       if (pwr == TYPEC_SOURCE)
+               switches1_data |= FUSB_REG_SWITCHES1_POWERROLE;
+       if (data == TYPEC_HOST)
+               switches1_data |= FUSB_REG_SWITCHES1_DATAROLE;
+       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES1,
+                                    switches1_mask, switches1_data);
+       if (ret < 0) {
+               fusb302_log(chip, "unable to set pd header %s, %s, ret=%d",
+                           typec_role_name[pwr], typec_data_role_name[data],
+                           ret);
+               goto done;
+       }
+       fusb302_log(chip, "pd header := %s, %s", typec_role_name[pwr],
+                   typec_data_role_name[data]);
+done:
+       mutex_unlock(&chip->lock);
+
+       return ret;
+}
+
+static int tcpm_start_drp_toggling(struct tcpc_dev *dev,
+                                  enum typec_cc_status cc)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int ret = 0;
+
+       mutex_lock(&chip->lock);
+       ret = fusb302_set_src_current(chip, cc_src_current[cc]);
+       if (ret < 0) {
+               fusb302_log(chip, "unable to set src current %s, ret=%d",
+                           typec_cc_status_name[cc], ret);
+               goto done;
+       }
+       ret = fusb302_set_toggling(chip, TOGGLING_MODE_DRP);
+       if (ret < 0) {
+               fusb302_log(chip,
+                           "unable to start drp toggling, ret=%d", ret);
+               goto done;
+       }
+       fusb302_log(chip, "start drp toggling");
+done:
+       mutex_unlock(&chip->lock);
+
+       return ret;
+}
+
+static int fusb302_pd_send_message(struct fusb302_chip *chip,
+                                  const struct pd_message *msg)
+{
+       int ret = 0;
+       u8 buf[40];
+       u8 pos = 0;
+       int len;
+
+       /* SOP tokens */
+       buf[pos++] = FUSB302_TKN_SYNC1;
+       buf[pos++] = FUSB302_TKN_SYNC1;
+       buf[pos++] = FUSB302_TKN_SYNC1;
+       buf[pos++] = FUSB302_TKN_SYNC2;
+
+       len = pd_header_cnt_le(msg->header) * 4;
+       /* plug 2 for header */
+       len += 2;
+       if (len > 0x1F) {
+               fusb302_log(chip,
+                           "PD message too long %d (incl. header)", len);
+               return -EINVAL;
+       }
+       /* packsym tells the FUSB302 chip that the next X bytes are payload */
+       buf[pos++] = FUSB302_TKN_PACKSYM | (len & 0x1F);
+       memcpy(&buf[pos], &msg->header, sizeof(msg->header));
+       pos += sizeof(msg->header);
+
+       len -= 2;
+       memcpy(&buf[pos], msg->payload, len);
+       pos += len;
+
+       /* CRC */
+       buf[pos++] = FUSB302_TKN_JAMCRC;
+       /* EOP */
+       buf[pos++] = FUSB302_TKN_EOP;
+       /* turn tx off after sending message */
+       buf[pos++] = FUSB302_TKN_TXOFF;
+       /* start transmission */
+       buf[pos++] = FUSB302_TKN_TXON;
+
+       ret = fusb302_i2c_block_write(chip, FUSB_REG_FIFOS, pos, buf);
+       if (ret < 0)
+               return ret;
+       fusb302_log(chip, "sending PD message header: %x", msg->header);
+       fusb302_log(chip, "sending PD message len: %d", len);
+
+       return ret;
+}
+
+static int fusb302_pd_send_hardreset(struct fusb302_chip *chip)
+{
+       return fusb302_i2c_set_bits(chip, FUSB_REG_CONTROL3,
+                                   FUSB_REG_CONTROL3_SEND_HARDRESET);
+}
+
+static const char * const transmit_type_name[] = {
+       [TCPC_TX_SOP]                   = "SOP",
+       [TCPC_TX_SOP_PRIME]             = "SOP'",
+       [TCPC_TX_SOP_PRIME_PRIME]       = "SOP''",
+       [TCPC_TX_SOP_DEBUG_PRIME]       = "DEBUG'",
+       [TCPC_TX_SOP_DEBUG_PRIME_PRIME] = "DEBUG''",
+       [TCPC_TX_HARD_RESET]            = "HARD_RESET",
+       [TCPC_TX_CABLE_RESET]           = "CABLE_RESET",
+       [TCPC_TX_BIST_MODE_2]           = "BIST_MODE_2",
+};
+
+static int tcpm_pd_transmit(struct tcpc_dev *dev, enum tcpm_transmit_type type,
+                           const struct pd_message *msg)
+{
+       struct fusb302_chip *chip = container_of(dev, struct fusb302_chip,
+                                                tcpc_dev);
+       int ret = 0;
+
+       mutex_lock(&chip->lock);
+       switch (type) {
+       case TCPC_TX_SOP:
+               ret = fusb302_pd_send_message(chip, msg);
+               if (ret < 0)
+                       fusb302_log(chip,
+                                   "cannot send PD message, ret=%d", ret);
+               break;
+       case TCPC_TX_HARD_RESET:
+               ret = fusb302_pd_send_hardreset(chip);
+               if (ret < 0)
+                       fusb302_log(chip,
+                                   "cannot send hardreset, ret=%d", ret);
+               break;
+       default:
+               fusb302_log(chip, "type %s not supported",
+                           transmit_type_name[type]);
+               ret = -EINVAL;
+       }
+       mutex_unlock(&chip->lock);
+
+       return ret;
+}
+
+static enum typec_cc_status fusb302_bc_lvl_to_cc(u8 bc_lvl)
+{
+       if (bc_lvl == FUSB_REG_STATUS0_BC_LVL_1230_MAX)
+               return TYPEC_CC_RP_3_0;
+       if (bc_lvl == FUSB_REG_STATUS0_BC_LVL_600_1230)
+               return TYPEC_CC_RP_1_5;
+       if (bc_lvl == FUSB_REG_STATUS0_BC_LVL_200_600)
+               return TYPEC_CC_RP_DEF;
+       return TYPEC_CC_OPEN;
+}
+
+static void fusb302_bc_lvl_handler_work(struct work_struct *work)
+{
+       struct fusb302_chip *chip = container_of(work, struct fusb302_chip,
+                                                bc_lvl_handler.work);
+       int ret = 0;
+       u8 status0;
+       u8 bc_lvl;
+       enum typec_cc_status cc_status;
+
+       mutex_lock(&chip->lock);
+       if (!chip->intr_bc_lvl) {
+               fusb302_log(chip, "BC_LVL interrupt is turned off, abort");
+               goto done;
+       }
+       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
+       if (ret < 0)
+               goto done;
+       fusb302_log(chip, "BC_LVL handler, status0=0x%02x", status0);
+       if (status0 & FUSB_REG_STATUS0_ACTIVITY) {
+               fusb302_log(chip, "CC activities detected, delay handling");
+               mod_delayed_work(chip->wq, &chip->bc_lvl_handler,
+                                msecs_to_jiffies(T_BC_LVL_DEBOUNCE_DELAY_MS));
+               goto done;
+       }
+       bc_lvl = status0 & FUSB_REG_STATUS0_BC_LVL_MASK;
+       cc_status = fusb302_bc_lvl_to_cc(bc_lvl);
+       if (chip->cc_polarity == TYPEC_POLARITY_CC1) {
+               if (chip->cc1 != cc_status) {
+                       fusb302_log(chip, "cc1: %s -> %s",
+                                   typec_cc_status_name[chip->cc1],
+                                   typec_cc_status_name[cc_status]);
+                       chip->cc1 = cc_status;
+                       tcpm_cc_change(chip->tcpm_port);
+               }
+       } else {
+               if (chip->cc2 != cc_status) {
+                       fusb302_log(chip, "cc2: %s -> %s",
+                                   typec_cc_status_name[chip->cc2],
+                                   typec_cc_status_name[cc_status]);
+                       chip->cc2 = cc_status;
+                       tcpm_cc_change(chip->tcpm_port);
+               }
+       }
+
+done:
+       mutex_unlock(&chip->lock);
+}
+
+#define PDO_FIXED_FLAGS \
+       (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP | PDO_FIXED_USB_COMM)
+
+static const u32 src_pdo[] = {
+       PDO_FIXED(5000, 400, PDO_FIXED_FLAGS),
+};
+
+static const struct tcpc_config fusb302_tcpc_config = {
+       .src_pdo = src_pdo,
+       .nr_src_pdo = ARRAY_SIZE(src_pdo),
+       .operating_snk_mw = 2500,
+       .type = TYPEC_PORT_DRP,
+       .data = TYPEC_PORT_DRD,
+       .default_role = TYPEC_SINK,
+       .alt_modes = NULL,
+};
+
+static void init_tcpc_dev(struct tcpc_dev *fusb302_tcpc_dev)
+{
+       fusb302_tcpc_dev->init = tcpm_init;
+       fusb302_tcpc_dev->get_vbus = tcpm_get_vbus;
+       fusb302_tcpc_dev->get_current_limit = tcpm_get_current_limit;
+       fusb302_tcpc_dev->set_cc = tcpm_set_cc;
+       fusb302_tcpc_dev->get_cc = tcpm_get_cc;
+       fusb302_tcpc_dev->set_polarity = tcpm_set_polarity;
+       fusb302_tcpc_dev->set_vconn = tcpm_set_vconn;
+       fusb302_tcpc_dev->set_vbus = tcpm_set_vbus;
+       fusb302_tcpc_dev->set_pd_rx = tcpm_set_pd_rx;
+       fusb302_tcpc_dev->set_roles = tcpm_set_roles;
+       fusb302_tcpc_dev->start_drp_toggling = tcpm_start_drp_toggling;
+       fusb302_tcpc_dev->pd_transmit = tcpm_pd_transmit;
+}
+
+static const char * const cc_polarity_name[] = {
+       [TYPEC_POLARITY_CC1]    = "Polarity_CC1",
+       [TYPEC_POLARITY_CC2]    = "Polarity_CC2",
+};
+
+static int fusb302_set_cc_polarity(struct fusb302_chip *chip,
+                                  enum typec_cc_polarity cc_polarity)
+{
+       int ret = 0;
+       u8 switches0_mask = FUSB_REG_SWITCHES0_CC1_PU_EN |
+                           FUSB_REG_SWITCHES0_CC2_PU_EN |
+                           FUSB_REG_SWITCHES0_VCONN_CC1 |
+                           FUSB_REG_SWITCHES0_VCONN_CC2 |
+                           FUSB_REG_SWITCHES0_MEAS_CC1 |
+                           FUSB_REG_SWITCHES0_MEAS_CC2;
+       u8 switches0_data = 0x00;
+       u8 switches1_mask = FUSB_REG_SWITCHES1_TXCC1_EN |
+                           FUSB_REG_SWITCHES1_TXCC2_EN;
+       u8 switches1_data = 0x00;
+
+       if (cc_polarity == TYPEC_POLARITY_CC1) {
+               switches0_data = FUSB_REG_SWITCHES0_MEAS_CC1;
+               if (chip->vconn_on)
+                       switches0_data |= FUSB_REG_SWITCHES0_VCONN_CC2;
+               if (chip->pull_up)
+                       switches0_data |= FUSB_REG_SWITCHES0_CC1_PU_EN;
+               switches1_data = FUSB_REG_SWITCHES1_TXCC1_EN;
+       } else {
+               switches0_data = FUSB_REG_SWITCHES0_MEAS_CC2;
+               if (chip->vconn_on)
+                       switches0_data |= FUSB_REG_SWITCHES0_VCONN_CC1;
+               if (chip->pull_up)
+                       switches0_data |= FUSB_REG_SWITCHES0_CC2_PU_EN;
+               switches1_data = FUSB_REG_SWITCHES1_TXCC2_EN;
+       }
+       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0,
+                                    switches0_mask, switches0_data);
+       if (ret < 0)
+               return ret;
+       ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES1,
+                                    switches1_mask, switches1_data);
+       if (ret < 0)
+               return ret;
+       chip->cc_polarity = cc_polarity;
+
+       return ret;
+}
+
+static int fusb302_handle_togdone_snk(struct fusb302_chip *chip,
+                                     u8 togdone_result)
+{
+       int ret = 0;
+       u8 status0;
+       u8 bc_lvl;
+       enum typec_cc_polarity cc_polarity;
+       enum typec_cc_status cc_status_active, cc1, cc2;
+
+       /* set pull_up, pull_down */
+       ret = fusb302_set_cc_pull(chip, false, true);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot set cc to pull down, ret=%d", ret);
+               return ret;
+       }
+       /* set polarity */
+       cc_polarity = (togdone_result == FUSB_REG_STATUS1A_TOGSS_SNK1) ?
+                     TYPEC_POLARITY_CC1 : TYPEC_POLARITY_CC2;
+       ret = fusb302_set_cc_polarity(chip, cc_polarity);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot set cc polarity %s, ret=%d",
+                           cc_polarity_name[cc_polarity], ret);
+               return ret;
+       }
+       /* fusb302_set_cc_polarity() has set the correct measure block */
+       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
+       if (ret < 0)
+               return ret;
+       bc_lvl = status0 & FUSB_REG_STATUS0_BC_LVL_MASK;
+       cc_status_active = fusb302_bc_lvl_to_cc(bc_lvl);
+       /* restart toggling if the cc status on the active line is OPEN */
+       if (cc_status_active == TYPEC_CC_OPEN) {
+               fusb302_log(chip, "restart toggling as CC_OPEN detected");
+               ret = fusb302_set_toggling(chip, chip->toggling_mode);
+               return ret;
+       }
+       /* update tcpm with the new cc value */
+       cc1 = (cc_polarity == TYPEC_POLARITY_CC1) ?
+             cc_status_active : TYPEC_CC_OPEN;
+       cc2 = (cc_polarity == TYPEC_POLARITY_CC2) ?
+             cc_status_active : TYPEC_CC_OPEN;
+       if ((chip->cc1 != cc1) || (chip->cc2 != cc2)) {
+               chip->cc1 = cc1;
+               chip->cc2 = cc2;
+               tcpm_cc_change(chip->tcpm_port);
+       }
+       /* turn off toggling */
+       ret = fusb302_set_toggling(chip, TOGGLINE_MODE_OFF);
+       if (ret < 0) {
+               fusb302_log(chip,
+                           "cannot set toggling mode off, ret=%d", ret);
+               return ret;
+       }
+       /* unmask bc_lvl interrupt */
+       ret = fusb302_i2c_clear_bits(chip, FUSB_REG_MASK, FUSB_REG_MASK_BC_LVL);
+       if (ret < 0) {
+               fusb302_log(chip,
+                           "cannot unmask bc_lcl interrupt, ret=%d", ret);
+               return ret;
+       }
+       chip->intr_bc_lvl = true;
+       fusb302_log(chip, "detected cc1=%s, cc2=%s",
+                   typec_cc_status_name[cc1],
+                   typec_cc_status_name[cc2]);
+
+       return ret;
+}
+
+static int fusb302_handle_togdone_src(struct fusb302_chip *chip,
+                                     u8 togdone_result)
+{
+       /*
+        * - set polarity (measure cc, vconn, tx)
+        * - set pull_up, pull_down
+        * - set cc1, cc2, and update to tcpm_port
+        * - set I_COMP interrupt on
+        */
+       int ret = 0;
+       u8 status0;
+       u8 ra_mda = ra_mda_value[chip->src_current_status];
+       u8 rd_mda = rd_mda_value[chip->src_current_status];
+       bool ra_comp, rd_comp;
+       enum typec_cc_polarity cc_polarity;
+       enum typec_cc_status cc_status_active, cc1, cc2;
+
+       /* set pull_up, pull_down */
+       ret = fusb302_set_cc_pull(chip, true, false);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot set cc to pull up, ret=%d", ret);
+               return ret;
+       }
+       /* set polarity */
+       cc_polarity = (togdone_result == FUSB_REG_STATUS1A_TOGSS_SRC1) ?
+                     TYPEC_POLARITY_CC1 : TYPEC_POLARITY_CC2;
+       ret = fusb302_set_cc_polarity(chip, cc_polarity);
+       if (ret < 0) {
+               fusb302_log(chip, "cannot set cc polarity %s, ret=%d",
+                           cc_polarity_name[cc_polarity], ret);
+               return ret;
+       }
+       /* fusb302_set_cc_polarity() has set the correct measure block */
+       ret = fusb302_i2c_write(chip, FUSB_REG_MEASURE, rd_mda);
+       if (ret < 0)
+               return ret;
+       usleep_range(50, 100);
+       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
+       if (ret < 0)
+               return ret;
+       rd_comp = !!(status0 & FUSB_REG_STATUS0_COMP);
+       if (!rd_comp) {
+               ret = fusb302_i2c_write(chip, FUSB_REG_MEASURE, ra_mda);
+               if (ret < 0)
+                       return ret;
+               usleep_range(50, 100);
+               ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
+               if (ret < 0)
+                       return ret;
+               ra_comp = !!(status0 & FUSB_REG_STATUS0_COMP);
+       }
+       if (rd_comp)
+               cc_status_active = TYPEC_CC_OPEN;
+       else if (ra_comp)
+               cc_status_active = TYPEC_CC_RD;
+       else
+               /* Ra is not supported, report as Open */
+               cc_status_active = TYPEC_CC_OPEN;
+       /* restart toggling if the cc status on the active line is OPEN */
+       if (cc_status_active == TYPEC_CC_OPEN) {
+               fusb302_log(chip, "restart toggling as CC_OPEN detected");
+               ret = fusb302_set_toggling(chip, chip->toggling_mode);
+               return ret;
+       }
+       /* update tcpm with the new cc value */
+       cc1 = (cc_polarity == TYPEC_POLARITY_CC1) ?
+             cc_status_active : TYPEC_CC_OPEN;
+       cc2 = (cc_polarity == TYPEC_POLARITY_CC2) ?
+             cc_status_active : TYPEC_CC_OPEN;
+       if ((chip->cc1 != cc1) || (chip->cc2 != cc2)) {
+               chip->cc1 = cc1;
+               chip->cc2 = cc2;
+               tcpm_cc_change(chip->tcpm_port);
+       }
+       /* turn off toggling */
+       ret = fusb302_set_toggling(chip, TOGGLINE_MODE_OFF);
+       if (ret < 0) {
+               fusb302_log(chip,
+                           "cannot set toggling mode off, ret=%d", ret);
+               return ret;
+       }
+       /* set MDAC to Rd threshold, and unmask I_COMP for unplug detection */
+       ret = fusb302_i2c_write(chip, FUSB_REG_MEASURE, rd_mda);
+       if (ret < 0)
+               return ret;
+       /* unmask comp_chng interrupt */
+       ret = fusb302_i2c_clear_bits(chip, FUSB_REG_MASK,
+                                    FUSB_REG_MASK_COMP_CHNG);
+       if (ret < 0) {
+               fusb302_log(chip,
+                           "cannot unmask bc_lcl interrupt, ret=%d", ret);
+               return ret;
+       }
+       chip->intr_comp_chng = true;
+       fusb302_log(chip, "detected cc1=%s, cc2=%s",
+                   typec_cc_status_name[cc1],
+                   typec_cc_status_name[cc2]);
+
+       return ret;
+}
+
+static int fusb302_handle_togdone(struct fusb302_chip *chip)
+{
+       int ret = 0;
+       u8 status1a;
+       u8 togdone_result;
+
+       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS1A, &status1a);
+       if (ret < 0)
+               return ret;
+       togdone_result = (status1a >> FUSB_REG_STATUS1A_TOGSS_POS) &
+                        FUSB_REG_STATUS1A_TOGSS_MASK;
+       switch (togdone_result) {
+       case FUSB_REG_STATUS1A_TOGSS_SNK1:
+       case FUSB_REG_STATUS1A_TOGSS_SNK2:
+               return fusb302_handle_togdone_snk(chip, togdone_result);
+       case FUSB_REG_STATUS1A_TOGSS_SRC1:
+       case FUSB_REG_STATUS1A_TOGSS_SRC2:
+               return fusb302_handle_togdone_src(chip, togdone_result);
+       case FUSB_REG_STATUS1A_TOGSS_AA:
+               /* doesn't support */
+               fusb302_log(chip, "AudioAccessory not supported");
+               fusb302_set_toggling(chip, chip->toggling_mode);
+               break;
+       default:
+               fusb302_log(chip, "TOGDONE with an invalid state: %d",
+                           togdone_result);
+               fusb302_set_toggling(chip, chip->toggling_mode);
+               break;
+       }
+       return ret;
+}
+
+static int fusb302_pd_reset(struct fusb302_chip *chip)
+{
+       return fusb302_i2c_set_bits(chip, FUSB_REG_RESET,
+                                   FUSB_REG_RESET_PD_RESET);
+}
+
+static int fusb302_pd_read_message(struct fusb302_chip *chip,
+                                  struct pd_message *msg)
+{
+       int ret = 0;
+       u8 token;
+       u8 crc[4];
+       int len;
+
+       /* first SOP token */
+       ret = fusb302_i2c_read(chip, FUSB_REG_FIFOS, &token);
+       if (ret < 0)
+               return ret;
+       ret = fusb302_i2c_block_read(chip, FUSB_REG_FIFOS, 2,
+                                    (u8 *)&msg->header);
+       if (ret < 0)
+               return ret;
+       len = pd_header_cnt_le(msg->header) * 4;
+       /* add 4 to length to include the CRC */
+       if (len > PD_MAX_PAYLOAD * 4) {
+               fusb302_log(chip, "PD message too long %d", len);
+               return -EINVAL;
+       }
+       if (len > 0) {
+               ret = fusb302_i2c_block_read(chip, FUSB_REG_FIFOS, len,
+                                            (u8 *)msg->payload);
+               if (ret < 0)
+                       return ret;
+       }
+       /* another 4 bytes to read CRC out */
+       ret = fusb302_i2c_block_read(chip, FUSB_REG_FIFOS, 4, crc);
+       if (ret < 0)
+               return ret;
+       fusb302_log(chip, "PD message header: %x", msg->header);
+       fusb302_log(chip, "PD message len: %d", len);
+
+       /*
+        * Check if we've read off a GoodCRC message. If so then indicate to
+        * TCPM that the previous transmission has completed. Otherwise we pass
+        * the received message over to TCPM for processing.
+        *
+        * We make this check here instead of basing the reporting decision on
+        * the IRQ event type, as it's possible for the chip to report the
+        * TX_SUCCESS and GCRCSENT events out of order on occasion, so we need
+        * to check the message type to ensure correct reporting to TCPM.
+        */
+       if ((!len) && (pd_header_type_le(msg->header) == PD_CTRL_GOOD_CRC))
+               tcpm_pd_transmit_complete(chip->tcpm_port, TCPC_TX_SUCCESS);
+       else
+               tcpm_pd_receive(chip->tcpm_port, msg);
+
+       return ret;
+}
+
+static irqreturn_t fusb302_irq_intn(int irq, void *dev_id)
+{
+       struct fusb302_chip *chip = dev_id;
+       int ret = 0;
+       u8 interrupt;
+       u8 interrupta;
+       u8 interruptb;
+       u8 status0;
+       bool vbus_present;
+       bool comp_result;
+       bool intr_togdone;
+       bool intr_bc_lvl;
+       bool intr_comp_chng;
+       struct pd_message pd_msg;
+
+       mutex_lock(&chip->lock);
+       /* grab a snapshot of intr flags */
+       intr_togdone = chip->intr_togdone;
+       intr_bc_lvl = chip->intr_bc_lvl;
+       intr_comp_chng = chip->intr_comp_chng;
+
+       ret = fusb302_i2c_read(chip, FUSB_REG_INTERRUPT, &interrupt);
+       if (ret < 0)
+               goto done;
+       ret = fusb302_i2c_read(chip, FUSB_REG_INTERRUPTA, &interrupta);
+       if (ret < 0)
+               goto done;
+       ret = fusb302_i2c_read(chip, FUSB_REG_INTERRUPTB, &interruptb);
+       if (ret < 0)
+               goto done;
+       ret = fusb302_i2c_read(chip, FUSB_REG_STATUS0, &status0);
+       if (ret < 0)
+               goto done;
+       fusb302_log(chip,
+                   "IRQ: 0x%02x, a: 0x%02x, b: 0x%02x, status0: 0x%02x",
+                   interrupt, interrupta, interruptb, status0);
+
+       if (interrupt & FUSB_REG_INTERRUPT_VBUSOK) {
+               vbus_present = !!(status0 & FUSB_REG_STATUS0_VBUSOK);
+               fusb302_log(chip, "IRQ: VBUS_OK, vbus=%s",
+                           vbus_present ? "On" : "Off");
+               if (vbus_present != chip->vbus_present) {
+                       chip->vbus_present = vbus_present;
+                       tcpm_vbus_change(chip->tcpm_port);
+               }
+       }
+
+       if ((interrupta & FUSB_REG_INTERRUPTA_TOGDONE) && intr_togdone) {
+               fusb302_log(chip, "IRQ: TOGDONE");
+               ret = fusb302_handle_togdone(chip);
+               if (ret < 0) {
+                       fusb302_log(chip,
+                                   "handle togdone error, ret=%d", ret);
+                       goto done;
+               }
+       }
+
+       if ((interrupt & FUSB_REG_INTERRUPT_BC_LVL) && intr_bc_lvl) {
+               fusb302_log(chip, "IRQ: BC_LVL, handler pending");
+               /*
+                * as BC_LVL interrupt can be affected by PD activity,
+                * apply delay to for the handler to wait for the PD
+                * signaling to finish.
+                */
+               mod_delayed_work(chip->wq, &chip->bc_lvl_handler,
+                                msecs_to_jiffies(T_BC_LVL_DEBOUNCE_DELAY_MS));
+       }
+
+       if ((interrupt & FUSB_REG_INTERRUPT_COMP_CHNG) && intr_comp_chng) {
+               comp_result = !!(status0 & FUSB_REG_STATUS0_COMP);
+               fusb302_log(chip, "IRQ: COMP_CHNG, comp=%s",
+                           comp_result ? "true" : "false");
+               if (comp_result) {
+                       /* cc level > Rd_threashold, detach */
+                       if (chip->cc_polarity == TYPEC_POLARITY_CC1)
+                               chip->cc1 = TYPEC_CC_OPEN;
+                       else
+                               chip->cc2 = TYPEC_CC_OPEN;
+                       tcpm_cc_change(chip->tcpm_port);
+               }
+       }
+
+       if (interrupt & FUSB_REG_INTERRUPT_COLLISION) {
+               fusb302_log(chip, "IRQ: PD collision");
+               tcpm_pd_transmit_complete(chip->tcpm_port, TCPC_TX_FAILED);
+       }
+
+       if (interrupta & FUSB_REG_INTERRUPTA_RETRYFAIL) {
+               fusb302_log(chip, "IRQ: PD retry failed");
+               tcpm_pd_transmit_complete(chip->tcpm_port, TCPC_TX_FAILED);
+       }
+
+       if (interrupta & FUSB_REG_INTERRUPTA_HARDSENT) {
+               fusb302_log(chip, "IRQ: PD hardreset sent");
+               ret = fusb302_pd_reset(chip);
+               if (ret < 0) {
+                       fusb302_log(chip, "cannot PD reset, ret=%d", ret);
+                       goto done;
+               }
+               tcpm_pd_transmit_complete(chip->tcpm_port, TCPC_TX_SUCCESS);
+       }
+
+       if (interrupta & FUSB_REG_INTERRUPTA_TX_SUCCESS) {
+               fusb302_log(chip, "IRQ: PD tx success");
+               ret = fusb302_pd_read_message(chip, &pd_msg);
+               if (ret < 0) {
+                       fusb302_log(chip,
+                                   "cannot read in PD message, ret=%d", ret);
+                       goto done;
+               }
+       }
+
+       if (interrupta & FUSB_REG_INTERRUPTA_HARDRESET) {
+               fusb302_log(chip, "IRQ: PD received hardreset");
+               ret = fusb302_pd_reset(chip);
+               if (ret < 0) {
+                       fusb302_log(chip, "cannot PD reset, ret=%d", ret);
+                       goto done;
+               }
+               tcpm_pd_hard_reset(chip->tcpm_port);
+       }
+
+       if (interruptb & FUSB_REG_INTERRUPTB_GCRCSENT) {
+               fusb302_log(chip, "IRQ: PD sent good CRC");
+               ret = fusb302_pd_read_message(chip, &pd_msg);
+               if (ret < 0) {
+                       fusb302_log(chip,
+                                   "cannot read in PD message, ret=%d", ret);
+                       goto done;
+               }
+       }
+done:
+       mutex_unlock(&chip->lock);
+
+       return IRQ_HANDLED;
+}
+
+static int init_gpio(struct fusb302_chip *chip)
+{
+       struct device_node *node;
+       int ret = 0;
+
+       node = chip->dev->of_node;
+       chip->gpio_int_n = of_get_named_gpio(node, "fcs,int_n", 0);
+       if (!gpio_is_valid(chip->gpio_int_n)) {
+               ret = chip->gpio_int_n;
+               dev_err(chip->dev, "cannot get named GPIO Int_N, ret=%d", ret);
+               return ret;
+       }
+       ret = devm_gpio_request(chip->dev, chip->gpio_int_n, "fcs,int_n");
+       if (ret < 0) {
+               dev_err(chip->dev, "cannot request GPIO Int_N, ret=%d", ret);
+               return ret;
+       }
+       ret = gpio_direction_input(chip->gpio_int_n);
+       if (ret < 0) {
+               dev_err(chip->dev,
+                       "cannot set GPIO Int_N to input, ret=%d", ret);
+               return ret;
+       }
+       ret = gpio_to_irq(chip->gpio_int_n);
+       if (ret < 0) {
+               dev_err(chip->dev,
+                       "cannot request IRQ for GPIO Int_N, ret=%d", ret);
+               return ret;
+       }
+       chip->gpio_int_n_irq = ret;
+       return 0;
+}
+
+static int fusb302_composite_snk_pdo_array(struct fusb302_chip *chip)
+{
+       struct device *dev = chip->dev;
+       u32 max_uv, max_ua;
+
+       chip->snk_pdo[0] = PDO_FIXED(5000, 400, PDO_FIXED_FLAGS);
+
+       /*
+        * As max_snk_ma/mv/mw is not needed for tcpc_config,
+        * those settings should be passed in via sink PDO, so
+        * "fcs, max-sink-*" properties will be deprecated, to
+        * perserve compatibility with existing users of them,
+        * we read those properties to convert them to be a var
+        * PDO.
+        */
+       if (device_property_read_u32(dev, "fcs,max-sink-microvolt", &max_uv) ||
+               device_property_read_u32(dev, "fcs,max-sink-microamp", &max_ua))
+               return 1;
+
+       chip->snk_pdo[1] = PDO_VAR(5000, max_uv / 1000, max_ua / 1000);
+       return 2;
+}
+
+static int fusb302_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+       struct fusb302_chip *chip;
+       struct i2c_adapter *adapter;
+       struct device *dev = &client->dev;
+       const char *name;
+       int ret = 0;
+       u32 v;
+
+       adapter = to_i2c_adapter(client->dev.parent);
+       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
+               dev_err(&client->dev,
+                       "I2C/SMBus block functionality not supported!\n");
+               return -ENODEV;
+       }
+       chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
+       if (!chip)
+               return -ENOMEM;
+
+       chip->i2c_client = client;
+       chip->dev = &client->dev;
+       chip->tcpc_config = fusb302_tcpc_config;
+       chip->tcpc_dev.config = &chip->tcpc_config;
+       mutex_init(&chip->lock);
+
+       chip->tcpc_dev.fwnode =
+               device_get_named_child_node(dev, "connector");
+
+       if (!device_property_read_u32(dev, "fcs,operating-sink-microwatt", &v))
+               chip->tcpc_config.operating_snk_mw = v / 1000;
+
+       /* Composite sink PDO */
+       chip->tcpc_config.nr_snk_pdo = fusb302_composite_snk_pdo_array(chip);
+       chip->tcpc_config.snk_pdo = chip->snk_pdo;
+
+       /*
+        * Devicetree platforms should get extcon via phandle (not yet
+        * supported). On ACPI platforms, we get the name from a device prop.
+        * This device prop is for kernel internal use only and is expected
+        * to be set by the platform code which also registers the i2c client
+        * for the fusb302.
+        */
+       if (device_property_read_string(dev, "fcs,extcon-name", &name) == 0) {
+               chip->extcon = extcon_get_extcon_dev(name);
+               if (!chip->extcon)
+                       return -EPROBE_DEFER;
+       }
+
+       chip->vbus = devm_regulator_get(chip->dev, "vbus");
+       if (IS_ERR(chip->vbus))
+               return PTR_ERR(chip->vbus);
+
+       chip->wq = create_singlethread_workqueue(dev_name(chip->dev));
+       if (!chip->wq)
+               return -ENOMEM;
+
+       INIT_DELAYED_WORK(&chip->bc_lvl_handler, fusb302_bc_lvl_handler_work);
+       init_tcpc_dev(&chip->tcpc_dev);
+
+       if (client->irq) {
+               chip->gpio_int_n_irq = client->irq;
+       } else {
+               ret = init_gpio(chip);
+               if (ret < 0)
+                       goto destroy_workqueue;
+       }
+
+       chip->tcpm_port = tcpm_register_port(&client->dev, &chip->tcpc_dev);
+       if (IS_ERR(chip->tcpm_port)) {
+               ret = PTR_ERR(chip->tcpm_port);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(dev, "cannot register tcpm port, ret=%d", ret);
+               goto destroy_workqueue;
+       }
+
+       ret = devm_request_threaded_irq(chip->dev, chip->gpio_int_n_irq,
+                                       NULL, fusb302_irq_intn,
+                                       IRQF_ONESHOT | IRQF_TRIGGER_LOW,
+                                       "fsc_interrupt_int_n", chip);
+       if (ret < 0) {
+               dev_err(dev, "cannot request IRQ for GPIO Int_N, ret=%d", ret);
+               goto tcpm_unregister_port;
+       }
+       enable_irq_wake(chip->gpio_int_n_irq);
+       fusb302_debugfs_init(chip);
+       i2c_set_clientdata(client, chip);
+
+       return ret;
+
+tcpm_unregister_port:
+       tcpm_unregister_port(chip->tcpm_port);
+destroy_workqueue:
+       destroy_workqueue(chip->wq);
+
+       return ret;
+}
+
+static int fusb302_remove(struct i2c_client *client)
+{
+       struct fusb302_chip *chip = i2c_get_clientdata(client);
+
+       tcpm_unregister_port(chip->tcpm_port);
+       destroy_workqueue(chip->wq);
+       fusb302_debugfs_exit(chip);
+
+       return 0;
+}
+
+static int fusb302_pm_suspend(struct device *dev)
+{
+       struct fusb302_chip *chip = dev->driver_data;
+
+       if (atomic_read(&chip->i2c_busy))
+               return -EBUSY;
+       atomic_set(&chip->pm_suspend, 1);
+
+       return 0;
+}
+
+static int fusb302_pm_resume(struct device *dev)
+{
+       struct fusb302_chip *chip = dev->driver_data;
+
+       atomic_set(&chip->pm_suspend, 0);
+
+       return 0;
+}
+
+static const struct of_device_id fusb302_dt_match[] = {
+       {.compatible = "fcs,fusb302"},
+       {},
+};
+MODULE_DEVICE_TABLE(of, fusb302_dt_match);
+
+static const struct i2c_device_id fusb302_i2c_device_id[] = {
+       {"typec_fusb302", 0},
+       {},
+};
+MODULE_DEVICE_TABLE(i2c, fusb302_i2c_device_id);
+
+static const struct dev_pm_ops fusb302_pm_ops = {
+       .suspend = fusb302_pm_suspend,
+       .resume = fusb302_pm_resume,
+};
+
+static struct i2c_driver fusb302_driver = {
+       .driver = {
+                  .name = "typec_fusb302",
+                  .pm = &fusb302_pm_ops,
+                  .of_match_table = of_match_ptr(fusb302_dt_match),
+                  },
+       .probe = fusb302_probe,
+       .remove = fusb302_remove,
+       .id_table = fusb302_i2c_device_id,
+};
+module_i2c_driver(fusb302_driver);
+
+MODULE_AUTHOR("Yueyao Zhu <yueyao.zhu@gmail.com>");
+MODULE_DESCRIPTION("Fairchild FUSB302 Type-C Chip Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/typec/tcpm/fusb302_reg.h b/drivers/usb/typec/tcpm/fusb302_reg.h
new file mode 100644 (file)
index 0000000..00b39d3
--- /dev/null
@@ -0,0 +1,177 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2016-2017 Google, Inc
+ *
+ * Fairchild FUSB302 Type-C Chip Driver
+ */
+
+#ifndef FUSB302_REG_H
+#define FUSB302_REG_H
+
+#define FUSB_REG_DEVICE_ID                     0x01
+#define FUSB_REG_SWITCHES0                     0x02
+#define FUSB_REG_SWITCHES0_CC2_PU_EN           BIT(7)
+#define FUSB_REG_SWITCHES0_CC1_PU_EN           BIT(6)
+#define FUSB_REG_SWITCHES0_VCONN_CC2           BIT(5)
+#define FUSB_REG_SWITCHES0_VCONN_CC1           BIT(4)
+#define FUSB_REG_SWITCHES0_MEAS_CC2            BIT(3)
+#define FUSB_REG_SWITCHES0_MEAS_CC1            BIT(2)
+#define FUSB_REG_SWITCHES0_CC2_PD_EN           BIT(1)
+#define FUSB_REG_SWITCHES0_CC1_PD_EN           BIT(0)
+#define FUSB_REG_SWITCHES1                     0x03
+#define FUSB_REG_SWITCHES1_POWERROLE           BIT(7)
+#define FUSB_REG_SWITCHES1_SPECREV1            BIT(6)
+#define FUSB_REG_SWITCHES1_SPECREV0            BIT(5)
+#define FUSB_REG_SWITCHES1_DATAROLE            BIT(4)
+#define FUSB_REG_SWITCHES1_AUTO_GCRC           BIT(2)
+#define FUSB_REG_SWITCHES1_TXCC2_EN            BIT(1)
+#define FUSB_REG_SWITCHES1_TXCC1_EN            BIT(0)
+#define FUSB_REG_MEASURE                       0x04
+#define FUSB_REG_MEASURE_MDAC5                 BIT(7)
+#define FUSB_REG_MEASURE_MDAC4                 BIT(6)
+#define FUSB_REG_MEASURE_MDAC3                 BIT(5)
+#define FUSB_REG_MEASURE_MDAC2                 BIT(4)
+#define FUSB_REG_MEASURE_MDAC1                 BIT(3)
+#define FUSB_REG_MEASURE_MDAC0                 BIT(2)
+#define FUSB_REG_MEASURE_VBUS                  BIT(1)
+#define FUSB_REG_MEASURE_XXXX5                 BIT(0)
+#define FUSB_REG_CONTROL0                      0x06
+#define FUSB_REG_CONTROL0_TX_FLUSH             BIT(6)
+#define FUSB_REG_CONTROL0_INT_MASK             BIT(5)
+#define FUSB_REG_CONTROL0_HOST_CUR_MASK                (0xC)
+#define FUSB_REG_CONTROL0_HOST_CUR_HIGH                (0xC)
+#define FUSB_REG_CONTROL0_HOST_CUR_MED         (0x8)
+#define FUSB_REG_CONTROL0_HOST_CUR_DEF         (0x4)
+#define FUSB_REG_CONTROL0_TX_START             BIT(0)
+#define FUSB_REG_CONTROL1                      0x07
+#define FUSB_REG_CONTROL1_ENSOP2DB             BIT(6)
+#define FUSB_REG_CONTROL1_ENSOP1DB             BIT(5)
+#define FUSB_REG_CONTROL1_BIST_MODE2           BIT(4)
+#define FUSB_REG_CONTROL1_RX_FLUSH             BIT(2)
+#define FUSB_REG_CONTROL1_ENSOP2               BIT(1)
+#define FUSB_REG_CONTROL1_ENSOP1               BIT(0)
+#define FUSB_REG_CONTROL2                      0x08
+#define FUSB_REG_CONTROL2_MODE                 BIT(1)
+#define FUSB_REG_CONTROL2_MODE_MASK            (0x6)
+#define FUSB_REG_CONTROL2_MODE_DFP             (0x6)
+#define FUSB_REG_CONTROL2_MODE_UFP             (0x4)
+#define FUSB_REG_CONTROL2_MODE_DRP             (0x2)
+#define FUSB_REG_CONTROL2_MODE_NONE            (0x0)
+#define FUSB_REG_CONTROL2_TOGGLE               BIT(0)
+#define FUSB_REG_CONTROL3                      0x09
+#define FUSB_REG_CONTROL3_SEND_HARDRESET       BIT(6)
+#define FUSB_REG_CONTROL3_BIST_TMODE           BIT(5)  /* 302B Only */
+#define FUSB_REG_CONTROL3_AUTO_HARDRESET       BIT(4)
+#define FUSB_REG_CONTROL3_AUTO_SOFTRESET       BIT(3)
+#define FUSB_REG_CONTROL3_N_RETRIES            BIT(1)
+#define FUSB_REG_CONTROL3_N_RETRIES_MASK       (0x6)
+#define FUSB_REG_CONTROL3_N_RETRIES_3          (0x6)
+#define FUSB_REG_CONTROL3_N_RETRIES_2          (0x4)
+#define FUSB_REG_CONTROL3_N_RETRIES_1          (0x2)
+#define FUSB_REG_CONTROL3_AUTO_RETRY           BIT(0)
+#define FUSB_REG_MASK                          0x0A
+#define FUSB_REG_MASK_VBUSOK                   BIT(7)
+#define FUSB_REG_MASK_ACTIVITY                 BIT(6)
+#define FUSB_REG_MASK_COMP_CHNG                        BIT(5)
+#define FUSB_REG_MASK_CRC_CHK                  BIT(4)
+#define FUSB_REG_MASK_ALERT                    BIT(3)
+#define FUSB_REG_MASK_WAKE                     BIT(2)
+#define FUSB_REG_MASK_COLLISION                        BIT(1)
+#define FUSB_REG_MASK_BC_LVL                   BIT(0)
+#define FUSB_REG_POWER                         0x0B
+#define FUSB_REG_POWER_PWR                     BIT(0)
+#define FUSB_REG_POWER_PWR_LOW                 0x1
+#define FUSB_REG_POWER_PWR_MEDIUM              0x3
+#define FUSB_REG_POWER_PWR_HIGH                        0x7
+#define FUSB_REG_POWER_PWR_ALL                 0xF
+#define FUSB_REG_RESET                         0x0C
+#define FUSB_REG_RESET_PD_RESET                        BIT(1)
+#define FUSB_REG_RESET_SW_RESET                        BIT(0)
+#define FUSB_REG_MASKA                         0x0E
+#define FUSB_REG_MASKA_OCP_TEMP                        BIT(7)
+#define FUSB_REG_MASKA_TOGDONE                 BIT(6)
+#define FUSB_REG_MASKA_SOFTFAIL                        BIT(5)
+#define FUSB_REG_MASKA_RETRYFAIL               BIT(4)
+#define FUSB_REG_MASKA_HARDSENT                        BIT(3)
+#define FUSB_REG_MASKA_TX_SUCCESS              BIT(2)
+#define FUSB_REG_MASKA_SOFTRESET               BIT(1)
+#define FUSB_REG_MASKA_HARDRESET               BIT(0)
+#define FUSB_REG_MASKB                         0x0F
+#define FUSB_REG_MASKB_GCRCSENT                        BIT(0)
+#define FUSB_REG_STATUS0A                      0x3C
+#define FUSB_REG_STATUS0A_SOFTFAIL             BIT(5)
+#define FUSB_REG_STATUS0A_RETRYFAIL            BIT(4)
+#define FUSB_REG_STATUS0A_POWER                        BIT(2)
+#define FUSB_REG_STATUS0A_RX_SOFT_RESET                BIT(1)
+#define FUSB_REG_STATUS0A_RX_HARD_RESET                BIT(0)
+#define FUSB_REG_STATUS1A                      0x3D
+#define FUSB_REG_STATUS1A_TOGSS                        BIT(3)
+#define FUSB_REG_STATUS1A_TOGSS_RUNNING                0x0
+#define FUSB_REG_STATUS1A_TOGSS_SRC1           0x1
+#define FUSB_REG_STATUS1A_TOGSS_SRC2           0x2
+#define FUSB_REG_STATUS1A_TOGSS_SNK1           0x5
+#define FUSB_REG_STATUS1A_TOGSS_SNK2           0x6
+#define FUSB_REG_STATUS1A_TOGSS_AA             0x7
+#define FUSB_REG_STATUS1A_TOGSS_POS            (3)
+#define FUSB_REG_STATUS1A_TOGSS_MASK           (0x7)
+#define FUSB_REG_STATUS1A_RXSOP2DB             BIT(2)
+#define FUSB_REG_STATUS1A_RXSOP1DB             BIT(1)
+#define FUSB_REG_STATUS1A_RXSOP                        BIT(0)
+#define FUSB_REG_INTERRUPTA                    0x3E
+#define FUSB_REG_INTERRUPTA_OCP_TEMP           BIT(7)
+#define FUSB_REG_INTERRUPTA_TOGDONE            BIT(6)
+#define FUSB_REG_INTERRUPTA_SOFTFAIL           BIT(5)
+#define FUSB_REG_INTERRUPTA_RETRYFAIL          BIT(4)
+#define FUSB_REG_INTERRUPTA_HARDSENT           BIT(3)
+#define FUSB_REG_INTERRUPTA_TX_SUCCESS         BIT(2)
+#define FUSB_REG_INTERRUPTA_SOFTRESET          BIT(1)
+#define FUSB_REG_INTERRUPTA_HARDRESET          BIT(0)
+#define FUSB_REG_INTERRUPTB                    0x3F
+#define FUSB_REG_INTERRUPTB_GCRCSENT           BIT(0)
+#define FUSB_REG_STATUS0                       0x40
+#define FUSB_REG_STATUS0_VBUSOK                        BIT(7)
+#define FUSB_REG_STATUS0_ACTIVITY              BIT(6)
+#define FUSB_REG_STATUS0_COMP                  BIT(5)
+#define FUSB_REG_STATUS0_CRC_CHK               BIT(4)
+#define FUSB_REG_STATUS0_ALERT                 BIT(3)
+#define FUSB_REG_STATUS0_WAKE                  BIT(2)
+#define FUSB_REG_STATUS0_BC_LVL_MASK           0x03
+#define FUSB_REG_STATUS0_BC_LVL_0_200          0x0
+#define FUSB_REG_STATUS0_BC_LVL_200_600                0x1
+#define FUSB_REG_STATUS0_BC_LVL_600_1230       0x2
+#define FUSB_REG_STATUS0_BC_LVL_1230_MAX       0x3
+#define FUSB_REG_STATUS0_BC_LVL1               BIT(1)
+#define FUSB_REG_STATUS0_BC_LVL0               BIT(0)
+#define FUSB_REG_STATUS1                       0x41
+#define FUSB_REG_STATUS1_RXSOP2                        BIT(7)
+#define FUSB_REG_STATUS1_RXSOP1                        BIT(6)
+#define FUSB_REG_STATUS1_RX_EMPTY              BIT(5)
+#define FUSB_REG_STATUS1_RX_FULL               BIT(4)
+#define FUSB_REG_STATUS1_TX_EMPTY              BIT(3)
+#define FUSB_REG_STATUS1_TX_FULL               BIT(2)
+#define FUSB_REG_INTERRUPT                     0x42
+#define FUSB_REG_INTERRUPT_VBUSOK              BIT(7)
+#define FUSB_REG_INTERRUPT_ACTIVITY            BIT(6)
+#define FUSB_REG_INTERRUPT_COMP_CHNG           BIT(5)
+#define FUSB_REG_INTERRUPT_CRC_CHK             BIT(4)
+#define FUSB_REG_INTERRUPT_ALERT               BIT(3)
+#define FUSB_REG_INTERRUPT_WAKE                        BIT(2)
+#define FUSB_REG_INTERRUPT_COLLISION           BIT(1)
+#define FUSB_REG_INTERRUPT_BC_LVL              BIT(0)
+#define FUSB_REG_FIFOS                         0x43
+
+/* Tokens defined for the FUSB302 TX FIFO */
+enum fusb302_txfifo_tokens {
+       FUSB302_TKN_TXON = 0xA1,
+       FUSB302_TKN_SYNC1 = 0x12,
+       FUSB302_TKN_SYNC2 = 0x13,
+       FUSB302_TKN_SYNC3 = 0x1B,
+       FUSB302_TKN_RST1 = 0x15,
+       FUSB302_TKN_RST2 = 0x16,
+       FUSB302_TKN_PACKSYM = 0x80,
+       FUSB302_TKN_JAMCRC = 0xFF,
+       FUSB302_TKN_EOP = 0x14,
+       FUSB302_TKN_TXOFF = 0xFE,
+};
+
+#endif
diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
new file mode 100644 (file)
index 0000000..ac6b418
--- /dev/null
@@ -0,0 +1,612 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2015-2017 Google, Inc
+ *
+ * USB Type-C Port Controller Interface.
+ */
+
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/property.h>
+#include <linux/regmap.h>
+#include <linux/usb/pd.h>
+#include <linux/usb/tcpm.h>
+#include <linux/usb/typec.h>
+
+#include "tcpci.h"
+
+#define PD_RETRY_COUNT 3
+
+struct tcpci {
+       struct device *dev;
+
+       struct tcpm_port *port;
+
+       struct regmap *regmap;
+
+       bool controls_vbus;
+
+       struct tcpc_dev tcpc;
+       struct tcpci_data *data;
+};
+
+struct tcpci_chip {
+       struct tcpci *tcpci;
+       struct tcpci_data data;
+};
+
+static inline struct tcpci *tcpc_to_tcpci(struct tcpc_dev *tcpc)
+{
+       return container_of(tcpc, struct tcpci, tcpc);
+}
+
+static int tcpci_read16(struct tcpci *tcpci, unsigned int reg, u16 *val)
+{
+       return regmap_raw_read(tcpci->regmap, reg, val, sizeof(u16));
+}
+
+static int tcpci_write16(struct tcpci *tcpci, unsigned int reg, u16 val)
+{
+       return regmap_raw_write(tcpci->regmap, reg, &val, sizeof(u16));
+}
+
+static int tcpci_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       unsigned int reg;
+       int ret;
+
+       switch (cc) {
+       case TYPEC_CC_RA:
+               reg = (TCPC_ROLE_CTRL_CC_RA << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                       (TCPC_ROLE_CTRL_CC_RA << TCPC_ROLE_CTRL_CC2_SHIFT);
+               break;
+       case TYPEC_CC_RD:
+               reg = (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                       (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT);
+               break;
+       case TYPEC_CC_RP_DEF:
+               reg = (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                       (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT) |
+                       (TCPC_ROLE_CTRL_RP_VAL_DEF <<
+                        TCPC_ROLE_CTRL_RP_VAL_SHIFT);
+               break;
+       case TYPEC_CC_RP_1_5:
+               reg = (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                       (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT) |
+                       (TCPC_ROLE_CTRL_RP_VAL_1_5 <<
+                        TCPC_ROLE_CTRL_RP_VAL_SHIFT);
+               break;
+       case TYPEC_CC_RP_3_0:
+               reg = (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                       (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT) |
+                       (TCPC_ROLE_CTRL_RP_VAL_3_0 <<
+                        TCPC_ROLE_CTRL_RP_VAL_SHIFT);
+               break;
+       case TYPEC_CC_OPEN:
+       default:
+               reg = (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                       (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC2_SHIFT);
+               break;
+       }
+
+       ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
+static int tcpci_start_drp_toggling(struct tcpc_dev *tcpc,
+                                   enum typec_cc_status cc)
+{
+       int ret;
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       unsigned int reg = TCPC_ROLE_CTRL_DRP;
+
+       /* Handle vendor drp toggling */
+       if (tcpci->data->start_drp_toggling) {
+               ret = tcpci->data->start_drp_toggling(tcpci, tcpci->data, cc);
+               if (ret < 0)
+                       return ret;
+       }
+
+       switch (cc) {
+       default:
+       case TYPEC_CC_RP_DEF:
+               reg |= (TCPC_ROLE_CTRL_RP_VAL_DEF <<
+                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
+               break;
+       case TYPEC_CC_RP_1_5:
+               reg |= (TCPC_ROLE_CTRL_RP_VAL_1_5 <<
+                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
+               break;
+       case TYPEC_CC_RP_3_0:
+               reg |= (TCPC_ROLE_CTRL_RP_VAL_3_0 <<
+                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
+               break;
+       }
+
+       if (cc == TYPEC_CC_RD)
+               reg |= (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                          (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT);
+       else
+               reg |= (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                          (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT);
+       ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
+       if (ret < 0)
+               return ret;
+       return regmap_write(tcpci->regmap, TCPC_COMMAND,
+                           TCPC_CMD_LOOK4CONNECTION);
+}
+
+static enum typec_cc_status tcpci_to_typec_cc(unsigned int cc, bool sink)
+{
+       switch (cc) {
+       case 0x1:
+               return sink ? TYPEC_CC_RP_DEF : TYPEC_CC_RA;
+       case 0x2:
+               return sink ? TYPEC_CC_RP_1_5 : TYPEC_CC_RD;
+       case 0x3:
+               if (sink)
+                       return TYPEC_CC_RP_3_0;
+               /* fall through */
+       case 0x0:
+       default:
+               return TYPEC_CC_OPEN;
+       }
+}
+
+static int tcpci_get_cc(struct tcpc_dev *tcpc,
+                       enum typec_cc_status *cc1, enum typec_cc_status *cc2)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       unsigned int reg;
+       int ret;
+
+       ret = regmap_read(tcpci->regmap, TCPC_CC_STATUS, &reg);
+       if (ret < 0)
+               return ret;
+
+       *cc1 = tcpci_to_typec_cc((reg >> TCPC_CC_STATUS_CC1_SHIFT) &
+                                TCPC_CC_STATUS_CC1_MASK,
+                                reg & TCPC_CC_STATUS_TERM);
+       *cc2 = tcpci_to_typec_cc((reg >> TCPC_CC_STATUS_CC2_SHIFT) &
+                                TCPC_CC_STATUS_CC2_MASK,
+                                reg & TCPC_CC_STATUS_TERM);
+
+       return 0;
+}
+
+static int tcpci_set_polarity(struct tcpc_dev *tcpc,
+                             enum typec_cc_polarity polarity)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       unsigned int reg;
+       int ret;
+
+       /* Keep the disconnect cc line open */
+       ret = regmap_read(tcpci->regmap, TCPC_ROLE_CTRL, &reg);
+       if (ret < 0)
+               return ret;
+
+       if (polarity == TYPEC_POLARITY_CC2)
+               reg |= TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC1_SHIFT;
+       else
+               reg |= TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC2_SHIFT;
+       ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
+       if (ret < 0)
+               return ret;
+
+       return regmap_write(tcpci->regmap, TCPC_TCPC_CTRL,
+                          (polarity == TYPEC_POLARITY_CC2) ?
+                          TCPC_TCPC_CTRL_ORIENTATION : 0);
+}
+
+static int tcpci_set_vconn(struct tcpc_dev *tcpc, bool enable)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       int ret;
+
+       /* Handle vendor set vconn */
+       if (tcpci->data->set_vconn) {
+               ret = tcpci->data->set_vconn(tcpci, tcpci->data, enable);
+               if (ret < 0)
+                       return ret;
+       }
+
+       return regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL,
+                               TCPC_POWER_CTRL_VCONN_ENABLE,
+                               enable ? TCPC_POWER_CTRL_VCONN_ENABLE : 0);
+}
+
+static int tcpci_set_roles(struct tcpc_dev *tcpc, bool attached,
+                          enum typec_role role, enum typec_data_role data)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       unsigned int reg;
+       int ret;
+
+       reg = PD_REV20 << TCPC_MSG_HDR_INFO_REV_SHIFT;
+       if (role == TYPEC_SOURCE)
+               reg |= TCPC_MSG_HDR_INFO_PWR_ROLE;
+       if (data == TYPEC_HOST)
+               reg |= TCPC_MSG_HDR_INFO_DATA_ROLE;
+       ret = regmap_write(tcpci->regmap, TCPC_MSG_HDR_INFO, reg);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
+static int tcpci_set_pd_rx(struct tcpc_dev *tcpc, bool enable)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       unsigned int reg = 0;
+       int ret;
+
+       if (enable)
+               reg = TCPC_RX_DETECT_SOP | TCPC_RX_DETECT_HARD_RESET;
+       ret = regmap_write(tcpci->regmap, TCPC_RX_DETECT, reg);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
+static int tcpci_get_vbus(struct tcpc_dev *tcpc)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       unsigned int reg;
+       int ret;
+
+       ret = regmap_read(tcpci->regmap, TCPC_POWER_STATUS, &reg);
+       if (ret < 0)
+               return ret;
+
+       return !!(reg & TCPC_POWER_STATUS_VBUS_PRES);
+}
+
+static int tcpci_set_vbus(struct tcpc_dev *tcpc, bool source, bool sink)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       int ret;
+
+       /* Disable both source and sink first before enabling anything */
+
+       if (!source) {
+               ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
+                                  TCPC_CMD_DISABLE_SRC_VBUS);
+               if (ret < 0)
+                       return ret;
+       }
+
+       if (!sink) {
+               ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
+                                  TCPC_CMD_DISABLE_SINK_VBUS);
+               if (ret < 0)
+                       return ret;
+       }
+
+       if (source) {
+               ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
+                                  TCPC_CMD_SRC_VBUS_DEFAULT);
+               if (ret < 0)
+                       return ret;
+       }
+
+       if (sink) {
+               ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
+                                  TCPC_CMD_SINK_VBUS);
+               if (ret < 0)
+                       return ret;
+       }
+
+       return 0;
+}
+
+static int tcpci_pd_transmit(struct tcpc_dev *tcpc,
+                            enum tcpm_transmit_type type,
+                            const struct pd_message *msg)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       u16 header = msg ? le16_to_cpu(msg->header) : 0;
+       unsigned int reg, cnt;
+       int ret;
+
+       cnt = msg ? pd_header_cnt(header) * 4 : 0;
+       ret = regmap_write(tcpci->regmap, TCPC_TX_BYTE_CNT, cnt + 2);
+       if (ret < 0)
+               return ret;
+
+       ret = tcpci_write16(tcpci, TCPC_TX_HDR, header);
+       if (ret < 0)
+               return ret;
+
+       if (cnt > 0) {
+               ret = regmap_raw_write(tcpci->regmap, TCPC_TX_DATA,
+                                      &msg->payload, cnt);
+               if (ret < 0)
+                       return ret;
+       }
+
+       reg = (PD_RETRY_COUNT << TCPC_TRANSMIT_RETRY_SHIFT) |
+               (type << TCPC_TRANSMIT_TYPE_SHIFT);
+       ret = regmap_write(tcpci->regmap, TCPC_TRANSMIT, reg);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
+static int tcpci_init(struct tcpc_dev *tcpc)
+{
+       struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+       unsigned long timeout = jiffies + msecs_to_jiffies(2000); /* XXX */
+       unsigned int reg;
+       int ret;
+
+       while (time_before_eq(jiffies, timeout)) {
+               ret = regmap_read(tcpci->regmap, TCPC_POWER_STATUS, &reg);
+               if (ret < 0)
+                       return ret;
+               if (!(reg & TCPC_POWER_STATUS_UNINIT))
+                       break;
+               usleep_range(10000, 20000);
+       }
+       if (time_after(jiffies, timeout))
+               return -ETIMEDOUT;
+
+       /* Handle vendor init */
+       if (tcpci->data->init) {
+               ret = tcpci->data->init(tcpci, tcpci->data);
+               if (ret < 0)
+                       return ret;
+       }
+
+       /* Clear all events */
+       ret = tcpci_write16(tcpci, TCPC_ALERT, 0xffff);
+       if (ret < 0)
+               return ret;
+
+       if (tcpci->controls_vbus)
+               reg = TCPC_POWER_STATUS_VBUS_PRES;
+       else
+               reg = 0;
+       ret = regmap_write(tcpci->regmap, TCPC_POWER_STATUS_MASK, reg);
+       if (ret < 0)
+               return ret;
+
+       /* Enable Vbus detection */
+       ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
+                          TCPC_CMD_ENABLE_VBUS_DETECT);
+       if (ret < 0)
+               return ret;
+
+       reg = TCPC_ALERT_TX_SUCCESS | TCPC_ALERT_TX_FAILED |
+               TCPC_ALERT_TX_DISCARDED | TCPC_ALERT_RX_STATUS |
+               TCPC_ALERT_RX_HARD_RST | TCPC_ALERT_CC_STATUS;
+       if (tcpci->controls_vbus)
+               reg |= TCPC_ALERT_POWER_STATUS;
+       return tcpci_write16(tcpci, TCPC_ALERT_MASK, reg);
+}
+
+irqreturn_t tcpci_irq(struct tcpci *tcpci)
+{
+       u16 status;
+
+       tcpci_read16(tcpci, TCPC_ALERT, &status);
+
+       /*
+        * Clear alert status for everything except RX_STATUS, which shouldn't
+        * be cleared until we have successfully retrieved message.
+        */
+       if (status & ~TCPC_ALERT_RX_STATUS)
+               tcpci_write16(tcpci, TCPC_ALERT,
+                             status & ~TCPC_ALERT_RX_STATUS);
+
+       if (status & TCPC_ALERT_CC_STATUS)
+               tcpm_cc_change(tcpci->port);
+
+       if (status & TCPC_ALERT_POWER_STATUS) {
+               unsigned int reg;
+
+               regmap_read(tcpci->regmap, TCPC_POWER_STATUS_MASK, &reg);
+
+               /*
+                * If power status mask has been reset, then the TCPC
+                * has reset.
+                */
+               if (reg == 0xff)
+                       tcpm_tcpc_reset(tcpci->port);
+               else
+                       tcpm_vbus_change(tcpci->port);
+       }
+
+       if (status & TCPC_ALERT_RX_STATUS) {
+               struct pd_message msg;
+               unsigned int cnt;
+               u16 header;
+
+               regmap_read(tcpci->regmap, TCPC_RX_BYTE_CNT, &cnt);
+
+               tcpci_read16(tcpci, TCPC_RX_HDR, &header);
+               msg.header = cpu_to_le16(header);
+
+               if (WARN_ON(cnt > sizeof(msg.payload)))
+                       cnt = sizeof(msg.payload);
+
+               if (cnt > 0)
+                       regmap_raw_read(tcpci->regmap, TCPC_RX_DATA,
+                                       &msg.payload, cnt);
+
+               /* Read complete, clear RX status alert bit */
+               tcpci_write16(tcpci, TCPC_ALERT, TCPC_ALERT_RX_STATUS);
+
+               tcpm_pd_receive(tcpci->port, &msg);
+       }
+
+       if (status & TCPC_ALERT_RX_HARD_RST)
+               tcpm_pd_hard_reset(tcpci->port);
+
+       if (status & TCPC_ALERT_TX_SUCCESS)
+               tcpm_pd_transmit_complete(tcpci->port, TCPC_TX_SUCCESS);
+       else if (status & TCPC_ALERT_TX_DISCARDED)
+               tcpm_pd_transmit_complete(tcpci->port, TCPC_TX_DISCARDED);
+       else if (status & TCPC_ALERT_TX_FAILED)
+               tcpm_pd_transmit_complete(tcpci->port, TCPC_TX_FAILED);
+
+       return IRQ_HANDLED;
+}
+EXPORT_SYMBOL_GPL(tcpci_irq);
+
+static irqreturn_t _tcpci_irq(int irq, void *dev_id)
+{
+       struct tcpci_chip *chip = dev_id;
+
+       return tcpci_irq(chip->tcpci);
+}
+
+static const struct regmap_config tcpci_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+
+       .max_register = 0x7F, /* 0x80 .. 0xFF are vendor defined */
+};
+
+static int tcpci_parse_config(struct tcpci *tcpci)
+{
+       tcpci->controls_vbus = true; /* XXX */
+
+       tcpci->tcpc.fwnode = device_get_named_child_node(tcpci->dev,
+                                                        "connector");
+       if (!tcpci->tcpc.fwnode) {
+               dev_err(tcpci->dev, "Can't find connector node.\n");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
+{
+       struct tcpci *tcpci;
+       int err;
+
+       tcpci = devm_kzalloc(dev, sizeof(*tcpci), GFP_KERNEL);
+       if (!tcpci)
+               return ERR_PTR(-ENOMEM);
+
+       tcpci->dev = dev;
+       tcpci->data = data;
+       tcpci->regmap = data->regmap;
+
+       tcpci->tcpc.init = tcpci_init;
+       tcpci->tcpc.get_vbus = tcpci_get_vbus;
+       tcpci->tcpc.set_vbus = tcpci_set_vbus;
+       tcpci->tcpc.set_cc = tcpci_set_cc;
+       tcpci->tcpc.get_cc = tcpci_get_cc;
+       tcpci->tcpc.set_polarity = tcpci_set_polarity;
+       tcpci->tcpc.set_vconn = tcpci_set_vconn;
+       tcpci->tcpc.start_drp_toggling = tcpci_start_drp_toggling;
+
+       tcpci->tcpc.set_pd_rx = tcpci_set_pd_rx;
+       tcpci->tcpc.set_roles = tcpci_set_roles;
+       tcpci->tcpc.pd_transmit = tcpci_pd_transmit;
+
+       err = tcpci_parse_config(tcpci);
+       if (err < 0)
+               return ERR_PTR(err);
+
+       tcpci->port = tcpm_register_port(tcpci->dev, &tcpci->tcpc);
+       if (IS_ERR(tcpci->port))
+               return ERR_CAST(tcpci->port);
+
+       return tcpci;
+}
+EXPORT_SYMBOL_GPL(tcpci_register_port);
+
+void tcpci_unregister_port(struct tcpci *tcpci)
+{
+       tcpm_unregister_port(tcpci->port);
+}
+EXPORT_SYMBOL_GPL(tcpci_unregister_port);
+
+static int tcpci_probe(struct i2c_client *client,
+                      const struct i2c_device_id *i2c_id)
+{
+       struct tcpci_chip *chip;
+       int err;
+       u16 val = 0;
+
+       chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
+       if (!chip)
+               return -ENOMEM;
+
+       chip->data.regmap = devm_regmap_init_i2c(client, &tcpci_regmap_config);
+       if (IS_ERR(chip->data.regmap))
+               return PTR_ERR(chip->data.regmap);
+
+       i2c_set_clientdata(client, chip);
+
+       /* Disable chip interrupts before requesting irq */
+       err = regmap_raw_write(chip->data.regmap, TCPC_ALERT_MASK, &val,
+                              sizeof(u16));
+       if (err < 0)
+               return err;
+
+       chip->tcpci = tcpci_register_port(&client->dev, &chip->data);
+       if (IS_ERR(chip->tcpci))
+               return PTR_ERR(chip->tcpci);
+
+       err = devm_request_threaded_irq(&client->dev, client->irq, NULL,
+                                       _tcpci_irq,
+                                       IRQF_ONESHOT | IRQF_TRIGGER_LOW,
+                                       dev_name(&client->dev), chip);
+       if (err < 0) {
+               tcpci_unregister_port(chip->tcpci);
+               return err;
+       }
+
+       return 0;
+}
+
+static int tcpci_remove(struct i2c_client *client)
+{
+       struct tcpci_chip *chip = i2c_get_clientdata(client);
+
+       tcpci_unregister_port(chip->tcpci);
+
+       return 0;
+}
+
+static const struct i2c_device_id tcpci_id[] = {
+       { "tcpci", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, tcpci_id);
+
+#ifdef CONFIG_OF
+static const struct of_device_id tcpci_of_match[] = {
+       { .compatible = "nxp,ptn5110", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, tcpci_of_match);
+#endif
+
+static struct i2c_driver tcpci_i2c_driver = {
+       .driver = {
+               .name = "tcpci",
+               .of_match_table = of_match_ptr(tcpci_of_match),
+       },
+       .probe = tcpci_probe,
+       .remove = tcpci_remove,
+       .id_table = tcpci_id,
+};
+module_i2c_driver(tcpci_i2c_driver);
+
+MODULE_DESCRIPTION("USB Type-C Port Controller Interface driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/typec/tcpm/tcpci.h b/drivers/usb/typec/tcpm/tcpci.h
new file mode 100644 (file)
index 0000000..303ebde
--- /dev/null
@@ -0,0 +1,139 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2015-2017 Google, Inc
+ *
+ * USB Type-C Port Controller Interface.
+ */
+
+#ifndef __LINUX_USB_TCPCI_H
+#define __LINUX_USB_TCPCI_H
+
+#define TCPC_VENDOR_ID                 0x0
+#define TCPC_PRODUCT_ID                        0x2
+#define TCPC_BCD_DEV                   0x4
+#define TCPC_TC_REV                    0x6
+#define TCPC_PD_REV                    0x8
+#define TCPC_PD_INT_REV                        0xa
+
+#define TCPC_ALERT                     0x10
+#define TCPC_ALERT_VBUS_DISCNCT                BIT(11)
+#define TCPC_ALERT_RX_BUF_OVF          BIT(10)
+#define TCPC_ALERT_FAULT               BIT(9)
+#define TCPC_ALERT_V_ALARM_LO          BIT(8)
+#define TCPC_ALERT_V_ALARM_HI          BIT(7)
+#define TCPC_ALERT_TX_SUCCESS          BIT(6)
+#define TCPC_ALERT_TX_DISCARDED                BIT(5)
+#define TCPC_ALERT_TX_FAILED           BIT(4)
+#define TCPC_ALERT_RX_HARD_RST         BIT(3)
+#define TCPC_ALERT_RX_STATUS           BIT(2)
+#define TCPC_ALERT_POWER_STATUS                BIT(1)
+#define TCPC_ALERT_CC_STATUS           BIT(0)
+
+#define TCPC_ALERT_MASK                        0x12
+#define TCPC_POWER_STATUS_MASK         0x14
+#define TCPC_FAULT_STATUS_MASK         0x15
+#define TCPC_CONFIG_STD_OUTPUT         0x18
+
+#define TCPC_TCPC_CTRL                 0x19
+#define TCPC_TCPC_CTRL_ORIENTATION     BIT(0)
+
+#define TCPC_ROLE_CTRL                 0x1a
+#define TCPC_ROLE_CTRL_DRP             BIT(6)
+#define TCPC_ROLE_CTRL_RP_VAL_SHIFT    4
+#define TCPC_ROLE_CTRL_RP_VAL_MASK     0x3
+#define TCPC_ROLE_CTRL_RP_VAL_DEF      0x0
+#define TCPC_ROLE_CTRL_RP_VAL_1_5      0x1
+#define TCPC_ROLE_CTRL_RP_VAL_3_0      0x2
+#define TCPC_ROLE_CTRL_CC2_SHIFT       2
+#define TCPC_ROLE_CTRL_CC2_MASK                0x3
+#define TCPC_ROLE_CTRL_CC1_SHIFT       0
+#define TCPC_ROLE_CTRL_CC1_MASK                0x3
+#define TCPC_ROLE_CTRL_CC_RA           0x0
+#define TCPC_ROLE_CTRL_CC_RP           0x1
+#define TCPC_ROLE_CTRL_CC_RD           0x2
+#define TCPC_ROLE_CTRL_CC_OPEN         0x3
+
+#define TCPC_FAULT_CTRL                        0x1b
+
+#define TCPC_POWER_CTRL                        0x1c
+#define TCPC_POWER_CTRL_VCONN_ENABLE   BIT(0)
+
+#define TCPC_CC_STATUS                 0x1d
+#define TCPC_CC_STATUS_TOGGLING                BIT(5)
+#define TCPC_CC_STATUS_TERM            BIT(4)
+#define TCPC_CC_STATUS_CC2_SHIFT       2
+#define TCPC_CC_STATUS_CC2_MASK                0x3
+#define TCPC_CC_STATUS_CC1_SHIFT       0
+#define TCPC_CC_STATUS_CC1_MASK                0x3
+
+#define TCPC_POWER_STATUS              0x1e
+#define TCPC_POWER_STATUS_UNINIT       BIT(6)
+#define TCPC_POWER_STATUS_VBUS_DET     BIT(3)
+#define TCPC_POWER_STATUS_VBUS_PRES    BIT(2)
+
+#define TCPC_FAULT_STATUS              0x1f
+
+#define TCPC_COMMAND                   0x23
+#define TCPC_CMD_WAKE_I2C              0x11
+#define TCPC_CMD_DISABLE_VBUS_DETECT   0x22
+#define TCPC_CMD_ENABLE_VBUS_DETECT    0x33
+#define TCPC_CMD_DISABLE_SINK_VBUS     0x44
+#define TCPC_CMD_SINK_VBUS             0x55
+#define TCPC_CMD_DISABLE_SRC_VBUS      0x66
+#define TCPC_CMD_SRC_VBUS_DEFAULT      0x77
+#define TCPC_CMD_SRC_VBUS_HIGH         0x88
+#define TCPC_CMD_LOOK4CONNECTION       0x99
+#define TCPC_CMD_RXONEMORE             0xAA
+#define TCPC_CMD_I2C_IDLE              0xFF
+
+#define TCPC_DEV_CAP_1                 0x24
+#define TCPC_DEV_CAP_2                 0x26
+#define TCPC_STD_INPUT_CAP             0x28
+#define TCPC_STD_OUTPUT_CAP            0x29
+
+#define TCPC_MSG_HDR_INFO              0x2e
+#define TCPC_MSG_HDR_INFO_DATA_ROLE    BIT(3)
+#define TCPC_MSG_HDR_INFO_PWR_ROLE     BIT(0)
+#define TCPC_MSG_HDR_INFO_REV_SHIFT    1
+#define TCPC_MSG_HDR_INFO_REV_MASK     0x3
+
+#define TCPC_RX_DETECT                 0x2f
+#define TCPC_RX_DETECT_HARD_RESET      BIT(5)
+#define TCPC_RX_DETECT_SOP             BIT(0)
+
+#define TCPC_RX_BYTE_CNT               0x30
+#define TCPC_RX_BUF_FRAME_TYPE         0x31
+#define TCPC_RX_HDR                    0x32
+#define TCPC_RX_DATA                   0x34 /* through 0x4f */
+
+#define TCPC_TRANSMIT                  0x50
+#define TCPC_TRANSMIT_RETRY_SHIFT      4
+#define TCPC_TRANSMIT_RETRY_MASK       0x3
+#define TCPC_TRANSMIT_TYPE_SHIFT       0
+#define TCPC_TRANSMIT_TYPE_MASK                0x7
+
+#define TCPC_TX_BYTE_CNT               0x51
+#define TCPC_TX_HDR                    0x52
+#define TCPC_TX_DATA                   0x54 /* through 0x6f */
+
+#define TCPC_VBUS_VOLTAGE                      0x70
+#define TCPC_VBUS_SINK_DISCONNECT_THRESH       0x72
+#define TCPC_VBUS_STOP_DISCHARGE_THRESH                0x74
+#define TCPC_VBUS_VOLTAGE_ALARM_HI_CFG         0x76
+#define TCPC_VBUS_VOLTAGE_ALARM_LO_CFG         0x78
+
+struct tcpci;
+struct tcpci_data {
+       struct regmap *regmap;
+       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);
+};
+
+struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data);
+void tcpci_unregister_port(struct tcpci *tcpci);
+irqreturn_t tcpci_irq(struct tcpci *tcpci);
+
+#endif /* __LINUX_USB_TCPCI_H */
diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
new file mode 100644 (file)
index 0000000..0173890
--- /dev/null
@@ -0,0 +1,312 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018, Richtek Technology Corporation
+ *
+ * Richtek RT1711H Type-C Chip Driver
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/gpio/consumer.h>
+#include <linux/usb/tcpm.h>
+#include <linux/regmap.h>
+#include "tcpci.h"
+
+#define RT1711H_VID            0x29CF
+#define RT1711H_PID            0x1711
+
+#define RT1711H_RTCTRL8                0x9B
+
+/* Autoidle timeout = (tout * 2 + 1) * 6.4ms */
+#define RT1711H_RTCTRL8_SET(ck300, ship_off, auto_idle, tout) \
+                           (((ck300) << 7) | ((ship_off) << 5) | \
+                           ((auto_idle) << 3) | ((tout) & 0x07))
+
+#define RT1711H_RTCTRL11       0x9E
+
+/* I2C timeout = (tout + 1) * 12.5ms */
+#define RT1711H_RTCTRL11_SET(en, tout) \
+                            (((en) << 7) | ((tout) & 0x0F))
+
+#define RT1711H_RTCTRL13       0xA0
+#define RT1711H_RTCTRL14       0xA1
+#define RT1711H_RTCTRL15       0xA2
+#define RT1711H_RTCTRL16       0xA3
+
+struct rt1711h_chip {
+       struct tcpci_data data;
+       struct tcpci *tcpci;
+       struct device *dev;
+};
+
+static int rt1711h_read16(struct rt1711h_chip *chip, unsigned int reg, u16 *val)
+{
+       return regmap_raw_read(chip->data.regmap, reg, val, sizeof(u16));
+}
+
+static int rt1711h_write16(struct rt1711h_chip *chip, unsigned int reg, u16 val)
+{
+       return regmap_raw_write(chip->data.regmap, reg, &val, sizeof(u16));
+}
+
+static int rt1711h_read8(struct rt1711h_chip *chip, unsigned int reg, u8 *val)
+{
+       return regmap_raw_read(chip->data.regmap, reg, val, sizeof(u8));
+}
+
+static int rt1711h_write8(struct rt1711h_chip *chip, unsigned int reg, u8 val)
+{
+       return regmap_raw_write(chip->data.regmap, reg, &val, sizeof(u8));
+}
+
+static const struct regmap_config rt1711h_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+
+       .max_register = 0xFF, /* 0x80 .. 0xFF are vendor defined */
+};
+
+static struct rt1711h_chip *tdata_to_rt1711h(struct tcpci_data *tdata)
+{
+       return container_of(tdata, struct rt1711h_chip, data);
+}
+
+static int rt1711h_init(struct tcpci *tcpci, struct tcpci_data *tdata)
+{
+       int ret;
+       struct rt1711h_chip *chip = tdata_to_rt1711h(tdata);
+
+       /* CK 300K from 320K, shipping off, auto_idle enable, tout = 32ms */
+       ret = rt1711h_write8(chip, RT1711H_RTCTRL8,
+                            RT1711H_RTCTRL8_SET(0, 1, 1, 2));
+       if (ret < 0)
+               return ret;
+
+       /* I2C reset : (val + 1) * 12.5ms */
+       ret = rt1711h_write8(chip, RT1711H_RTCTRL11,
+                            RT1711H_RTCTRL11_SET(1, 0x0F));
+       if (ret < 0)
+               return ret;
+
+       /* tTCPCfilter : (26.7 * val) us */
+       ret = rt1711h_write8(chip, RT1711H_RTCTRL14, 0x0F);
+       if (ret < 0)
+               return ret;
+
+       /*  tDRP : (51.2 + 6.4 * val) ms */
+       ret = rt1711h_write8(chip, RT1711H_RTCTRL15, 0x04);
+       if (ret < 0)
+               return ret;
+
+       /* dcSRC.DRP : 33% */
+       return rt1711h_write16(chip, RT1711H_RTCTRL16, 330);
+}
+
+static int rt1711h_set_vconn(struct tcpci *tcpci, struct tcpci_data *tdata,
+                            bool enable)
+{
+       struct rt1711h_chip *chip = tdata_to_rt1711h(tdata);
+
+       return rt1711h_write8(chip, RT1711H_RTCTRL8,
+                             RT1711H_RTCTRL8_SET(0, 1, !enable, 2));
+}
+
+static int rt1711h_start_drp_toggling(struct tcpci *tcpci,
+                                     struct tcpci_data *tdata,
+                                     enum typec_cc_status cc)
+{
+       struct rt1711h_chip *chip = tdata_to_rt1711h(tdata);
+       int ret;
+       unsigned int reg = 0;
+
+       switch (cc) {
+       default:
+       case TYPEC_CC_RP_DEF:
+               reg |= (TCPC_ROLE_CTRL_RP_VAL_DEF <<
+                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
+               break;
+       case TYPEC_CC_RP_1_5:
+               reg |= (TCPC_ROLE_CTRL_RP_VAL_1_5 <<
+                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
+               break;
+       case TYPEC_CC_RP_3_0:
+               reg |= (TCPC_ROLE_CTRL_RP_VAL_3_0 <<
+                       TCPC_ROLE_CTRL_RP_VAL_SHIFT);
+               break;
+       }
+
+       if (cc == TYPEC_CC_RD)
+               reg |= (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                          (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT);
+       else
+               reg |= (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
+                          (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT);
+
+       ret = rt1711h_write8(chip, TCPC_ROLE_CTRL, reg);
+       if (ret < 0)
+               return ret;
+       usleep_range(500, 1000);
+
+       return 0;
+}
+
+static irqreturn_t rt1711h_irq(int irq, void *dev_id)
+{
+       int ret;
+       u16 alert;
+       u8 status;
+       struct rt1711h_chip *chip = dev_id;
+
+       if (!chip->tcpci)
+               return IRQ_HANDLED;
+
+       ret = rt1711h_read16(chip, TCPC_ALERT, &alert);
+       if (ret < 0)
+               goto out;
+
+       if (alert & TCPC_ALERT_CC_STATUS) {
+               ret = rt1711h_read8(chip, TCPC_CC_STATUS, &status);
+               if (ret < 0)
+                       goto out;
+               /* Clear cc change event triggered by starting toggling */
+               if (status & TCPC_CC_STATUS_TOGGLING)
+                       rt1711h_write8(chip, TCPC_ALERT, TCPC_ALERT_CC_STATUS);
+       }
+
+out:
+       return tcpci_irq(chip->tcpci);
+}
+
+static int rt1711h_init_alert(struct rt1711h_chip *chip,
+                             struct i2c_client *client)
+{
+       int ret;
+
+       /* Disable chip interrupts before requesting irq */
+       ret = rt1711h_write16(chip, TCPC_ALERT_MASK, 0);
+       if (ret < 0)
+               return ret;
+
+       ret = devm_request_threaded_irq(chip->dev, client->irq, NULL,
+                                       rt1711h_irq,
+                                       IRQF_ONESHOT | IRQF_TRIGGER_LOW,
+                                       dev_name(chip->dev), chip);
+       if (ret < 0)
+               return ret;
+       enable_irq_wake(client->irq);
+       return 0;
+}
+
+static int rt1711h_sw_reset(struct rt1711h_chip *chip)
+{
+       int ret;
+
+       ret = rt1711h_write8(chip, RT1711H_RTCTRL13, 0x01);
+       if (ret < 0)
+               return ret;
+
+       usleep_range(1000, 2000);
+       return 0;
+}
+
+static int rt1711h_check_revision(struct i2c_client *i2c)
+{
+       int ret;
+
+       ret = i2c_smbus_read_word_data(i2c, TCPC_VENDOR_ID);
+       if (ret < 0)
+               return ret;
+       if (ret != RT1711H_VID) {
+               dev_err(&i2c->dev, "vid is not correct, 0x%04x\n", ret);
+               return -ENODEV;
+       }
+       ret = i2c_smbus_read_word_data(i2c, TCPC_PRODUCT_ID);
+       if (ret < 0)
+               return ret;
+       if (ret != RT1711H_PID) {
+               dev_err(&i2c->dev, "pid is not correct, 0x%04x\n", ret);
+               return -ENODEV;
+       }
+       return 0;
+}
+
+static int rt1711h_probe(struct i2c_client *client,
+                        const struct i2c_device_id *i2c_id)
+{
+       int ret;
+       struct rt1711h_chip *chip;
+
+       ret = rt1711h_check_revision(client);
+       if (ret < 0) {
+               dev_err(&client->dev, "check vid/pid fail\n");
+               return ret;
+       }
+
+       chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
+       if (!chip)
+               return -ENOMEM;
+
+       chip->data.regmap = devm_regmap_init_i2c(client,
+                                                &rt1711h_regmap_config);
+       if (IS_ERR(chip->data.regmap))
+               return PTR_ERR(chip->data.regmap);
+
+       chip->dev = &client->dev;
+       i2c_set_clientdata(client, chip);
+
+       ret = rt1711h_sw_reset(chip);
+       if (ret < 0)
+               return ret;
+
+       ret = rt1711h_init_alert(chip, client);
+       if (ret < 0)
+               return ret;
+
+       chip->data.init = rt1711h_init;
+       chip->data.set_vconn = rt1711h_set_vconn;
+       chip->data.start_drp_toggling = rt1711h_start_drp_toggling;
+       chip->tcpci = tcpci_register_port(chip->dev, &chip->data);
+       if (IS_ERR_OR_NULL(chip->tcpci))
+               return PTR_ERR(chip->tcpci);
+
+       return 0;
+}
+
+static int rt1711h_remove(struct i2c_client *client)
+{
+       struct rt1711h_chip *chip = i2c_get_clientdata(client);
+
+       tcpci_unregister_port(chip->tcpci);
+       return 0;
+}
+
+static const struct i2c_device_id rt1711h_id[] = {
+       { "rt1711h", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, rt1711h_id);
+
+#ifdef CONFIG_OF
+static const struct of_device_id rt1711h_of_match[] = {
+       { .compatible = "richtek,rt1711h", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, rt1711h_of_match);
+#endif
+
+static struct i2c_driver rt1711h_i2c_driver = {
+       .driver = {
+               .name = "rt1711h",
+               .of_match_table = of_match_ptr(rt1711h_of_match),
+       },
+       .probe = rt1711h_probe,
+       .remove = rt1711h_remove,
+       .id_table = rt1711h_id,
+};
+module_i2c_driver(rt1711h_i2c_driver);
+
+MODULE_AUTHOR("ShuFan Lee <shufan_lee@richtek.com>");
+MODULE_DESCRIPTION("RT1711H USB Type-C Port Controller Interface Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
new file mode 100644 (file)
index 0000000..4f1f421
--- /dev/null
@@ -0,0 +1,4851 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2015-2017 Google, Inc
+ *
+ * USB Power Delivery protocol stack.
+ */
+
+#include <linux/completion.h>
+#include <linux/debugfs.h>
+#include <linux/device.h>
+#include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/power_supply.h>
+#include <linux/proc_fs.h>
+#include <linux/property.h>
+#include <linux/sched/clock.h>
+#include <linux/seq_file.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/usb/pd.h>
+#include <linux/usb/pd_ado.h>
+#include <linux/usb/pd_bdo.h>
+#include <linux/usb/pd_ext_sdb.h>
+#include <linux/usb/pd_vdo.h>
+#include <linux/usb/role.h>
+#include <linux/usb/tcpm.h>
+#include <linux/usb/typec_altmode.h>
+#include <linux/workqueue.h>
+
+#define FOREACH_STATE(S)                       \
+       S(INVALID_STATE),                       \
+       S(DRP_TOGGLING),                        \
+       S(SRC_UNATTACHED),                      \
+       S(SRC_ATTACH_WAIT),                     \
+       S(SRC_ATTACHED),                        \
+       S(SRC_STARTUP),                         \
+       S(SRC_SEND_CAPABILITIES),               \
+       S(SRC_NEGOTIATE_CAPABILITIES),          \
+       S(SRC_TRANSITION_SUPPLY),               \
+       S(SRC_READY),                           \
+       S(SRC_WAIT_NEW_CAPABILITIES),           \
+                                               \
+       S(SNK_UNATTACHED),                      \
+       S(SNK_ATTACH_WAIT),                     \
+       S(SNK_DEBOUNCED),                       \
+       S(SNK_ATTACHED),                        \
+       S(SNK_STARTUP),                         \
+       S(SNK_DISCOVERY),                       \
+       S(SNK_DISCOVERY_DEBOUNCE),              \
+       S(SNK_DISCOVERY_DEBOUNCE_DONE),         \
+       S(SNK_WAIT_CAPABILITIES),               \
+       S(SNK_NEGOTIATE_CAPABILITIES),          \
+       S(SNK_NEGOTIATE_PPS_CAPABILITIES),      \
+       S(SNK_TRANSITION_SINK),                 \
+       S(SNK_TRANSITION_SINK_VBUS),            \
+       S(SNK_READY),                           \
+                                               \
+       S(ACC_UNATTACHED),                      \
+       S(DEBUG_ACC_ATTACHED),                  \
+       S(AUDIO_ACC_ATTACHED),                  \
+       S(AUDIO_ACC_DEBOUNCE),                  \
+                                               \
+       S(HARD_RESET_SEND),                     \
+       S(HARD_RESET_START),                    \
+       S(SRC_HARD_RESET_VBUS_OFF),             \
+       S(SRC_HARD_RESET_VBUS_ON),              \
+       S(SNK_HARD_RESET_SINK_OFF),             \
+       S(SNK_HARD_RESET_WAIT_VBUS),            \
+       S(SNK_HARD_RESET_SINK_ON),              \
+                                               \
+       S(SOFT_RESET),                          \
+       S(SOFT_RESET_SEND),                     \
+                                               \
+       S(DR_SWAP_ACCEPT),                      \
+       S(DR_SWAP_SEND),                        \
+       S(DR_SWAP_SEND_TIMEOUT),                \
+       S(DR_SWAP_CANCEL),                      \
+       S(DR_SWAP_CHANGE_DR),                   \
+                                               \
+       S(PR_SWAP_ACCEPT),                      \
+       S(PR_SWAP_SEND),                        \
+       S(PR_SWAP_SEND_TIMEOUT),                \
+       S(PR_SWAP_CANCEL),                      \
+       S(PR_SWAP_START),                       \
+       S(PR_SWAP_SRC_SNK_TRANSITION_OFF),      \
+       S(PR_SWAP_SRC_SNK_SOURCE_OFF),          \
+       S(PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED), \
+       S(PR_SWAP_SRC_SNK_SINK_ON),             \
+       S(PR_SWAP_SNK_SRC_SINK_OFF),            \
+       S(PR_SWAP_SNK_SRC_SOURCE_ON),           \
+       S(PR_SWAP_SNK_SRC_SOURCE_ON_VBUS_RAMPED_UP),    \
+                                               \
+       S(VCONN_SWAP_ACCEPT),                   \
+       S(VCONN_SWAP_SEND),                     \
+       S(VCONN_SWAP_SEND_TIMEOUT),             \
+       S(VCONN_SWAP_CANCEL),                   \
+       S(VCONN_SWAP_START),                    \
+       S(VCONN_SWAP_WAIT_FOR_VCONN),           \
+       S(VCONN_SWAP_TURN_ON_VCONN),            \
+       S(VCONN_SWAP_TURN_OFF_VCONN),           \
+                                               \
+       S(SNK_TRY),                             \
+       S(SNK_TRY_WAIT),                        \
+       S(SNK_TRY_WAIT_DEBOUNCE),               \
+       S(SNK_TRY_WAIT_DEBOUNCE_CHECK_VBUS),    \
+       S(SRC_TRYWAIT),                         \
+       S(SRC_TRYWAIT_DEBOUNCE),                \
+       S(SRC_TRYWAIT_UNATTACHED),              \
+                                               \
+       S(SRC_TRY),                             \
+       S(SRC_TRY_WAIT),                        \
+       S(SRC_TRY_DEBOUNCE),                    \
+       S(SNK_TRYWAIT),                         \
+       S(SNK_TRYWAIT_DEBOUNCE),                \
+       S(SNK_TRYWAIT_VBUS),                    \
+       S(BIST_RX),                             \
+                                               \
+       S(GET_STATUS_SEND),                     \
+       S(GET_STATUS_SEND_TIMEOUT),             \
+       S(GET_PPS_STATUS_SEND),                 \
+       S(GET_PPS_STATUS_SEND_TIMEOUT),         \
+                                               \
+       S(ERROR_RECOVERY),                      \
+       S(PORT_RESET),                          \
+       S(PORT_RESET_WAIT_OFF)
+
+#define GENERATE_ENUM(e)       e
+#define GENERATE_STRING(s)     #s
+
+enum tcpm_state {
+       FOREACH_STATE(GENERATE_ENUM)
+};
+
+static const char * const tcpm_states[] = {
+       FOREACH_STATE(GENERATE_STRING)
+};
+
+enum vdm_states {
+       VDM_STATE_ERR_BUSY = -3,
+       VDM_STATE_ERR_SEND = -2,
+       VDM_STATE_ERR_TMOUT = -1,
+       VDM_STATE_DONE = 0,
+       /* Anything >0 represents an active state */
+       VDM_STATE_READY = 1,
+       VDM_STATE_BUSY = 2,
+       VDM_STATE_WAIT_RSP_BUSY = 3,
+};
+
+enum pd_msg_request {
+       PD_MSG_NONE = 0,
+       PD_MSG_CTRL_REJECT,
+       PD_MSG_CTRL_WAIT,
+       PD_MSG_CTRL_NOT_SUPP,
+       PD_MSG_DATA_SINK_CAP,
+       PD_MSG_DATA_SOURCE_CAP,
+};
+
+/* Events from low level driver */
+
+#define TCPM_CC_EVENT          BIT(0)
+#define TCPM_VBUS_EVENT                BIT(1)
+#define TCPM_RESET_EVENT       BIT(2)
+
+#define LOG_BUFFER_ENTRIES     1024
+#define LOG_BUFFER_ENTRY_SIZE  128
+
+/* Alternate mode support */
+
+#define SVID_DISCOVERY_MAX     16
+#define ALTMODE_DISCOVERY_MAX  (SVID_DISCOVERY_MAX * MODE_DISCOVERY_MAX)
+
+struct pd_mode_data {
+       int svid_index;         /* current SVID index           */
+       int nsvids;
+       u16 svids[SVID_DISCOVERY_MAX];
+       int altmodes;           /* number of alternate modes    */
+       struct typec_altmode_desc altmode_desc[ALTMODE_DISCOVERY_MAX];
+};
+
+struct pd_pps_data {
+       u32 min_volt;
+       u32 max_volt;
+       u32 max_curr;
+       u32 out_volt;
+       u32 op_curr;
+       bool supported;
+       bool active;
+};
+
+struct tcpm_port {
+       struct device *dev;
+
+       struct mutex lock;              /* tcpm state machine lock */
+       struct workqueue_struct *wq;
+
+       struct typec_capability typec_caps;
+       struct typec_port *typec_port;
+
+       struct tcpc_dev *tcpc;
+       struct usb_role_switch *role_sw;
+
+       enum typec_role vconn_role;
+       enum typec_role pwr_role;
+       enum typec_data_role data_role;
+       enum typec_pwr_opmode pwr_opmode;
+
+       struct usb_pd_identity partner_ident;
+       struct typec_partner_desc partner_desc;
+       struct typec_partner *partner;
+
+       enum typec_cc_status cc_req;
+
+       enum typec_cc_status cc1;
+       enum typec_cc_status cc2;
+       enum typec_cc_polarity polarity;
+
+       bool attached;
+       bool connected;
+       enum typec_port_type port_type;
+       bool vbus_present;
+       bool vbus_never_low;
+       bool vbus_source;
+       bool vbus_charge;
+
+       bool send_discover;
+       bool op_vsafe5v;
+
+       int try_role;
+       int try_snk_count;
+       int try_src_count;
+
+       enum pd_msg_request queued_message;
+
+       enum tcpm_state enter_state;
+       enum tcpm_state prev_state;
+       enum tcpm_state state;
+       enum tcpm_state delayed_state;
+       unsigned long delayed_runtime;
+       unsigned long delay_ms;
+
+       spinlock_t pd_event_lock;
+       u32 pd_events;
+
+       struct work_struct event_work;
+       struct delayed_work state_machine;
+       struct delayed_work vdm_state_machine;
+       bool state_machine_running;
+
+       struct completion tx_complete;
+       enum tcpm_transmit_status tx_status;
+
+       struct mutex swap_lock;         /* swap command lock */
+       bool swap_pending;
+       bool non_pd_role_swap;
+       struct completion swap_complete;
+       int swap_status;
+
+       unsigned int negotiated_rev;
+       unsigned int message_id;
+       unsigned int caps_count;
+       unsigned int hard_reset_count;
+       bool pd_capable;
+       bool explicit_contract;
+       unsigned int rx_msgid;
+
+       /* Partner capabilities/requests */
+       u32 sink_request;
+       u32 source_caps[PDO_MAX_OBJECTS];
+       unsigned int nr_source_caps;
+       u32 sink_caps[PDO_MAX_OBJECTS];
+       unsigned int nr_sink_caps;
+
+       /* Local capabilities */
+       u32 src_pdo[PDO_MAX_OBJECTS];
+       unsigned int nr_src_pdo;
+       u32 snk_pdo[PDO_MAX_OBJECTS];
+       unsigned int nr_snk_pdo;
+       u32 snk_vdo[VDO_MAX_OBJECTS];
+       unsigned int nr_snk_vdo;
+
+       unsigned int operating_snk_mw;
+       bool update_sink_caps;
+
+       /* Requested current / voltage */
+       u32 current_limit;
+       u32 supply_voltage;
+
+       /* Used to export TA voltage and current */
+       struct power_supply *psy;
+       struct power_supply_desc psy_desc;
+       enum power_supply_usb_type usb_type;
+
+       u32 bist_request;
+
+       /* PD state for Vendor Defined Messages */
+       enum vdm_states vdm_state;
+       u32 vdm_retries;
+       /* next Vendor Defined Message to send */
+       u32 vdo_data[VDO_MAX_SIZE];
+       u8 vdo_count;
+       /* VDO to retry if UFP responder replied busy */
+       u32 vdo_retry;
+
+       /* PPS */
+       struct pd_pps_data pps_data;
+       struct completion pps_complete;
+       bool pps_pending;
+       int pps_status;
+
+       /* Alternate mode data */
+       struct pd_mode_data mode_data;
+       struct typec_altmode *partner_altmode[ALTMODE_DISCOVERY_MAX];
+       struct typec_altmode *port_altmode[ALTMODE_DISCOVERY_MAX];
+
+       /* Deadline in jiffies to exit src_try_wait state */
+       unsigned long max_wait;
+
+#ifdef CONFIG_DEBUG_FS
+       struct dentry *dentry;
+       struct mutex logbuffer_lock;    /* log buffer access lock */
+       int logbuffer_head;
+       int logbuffer_tail;
+       u8 *logbuffer[LOG_BUFFER_ENTRIES];
+#endif
+};
+
+struct pd_rx_event {
+       struct work_struct work;
+       struct tcpm_port *port;
+       struct pd_message msg;
+};
+
+#define tcpm_cc_is_sink(cc) \
+       ((cc) == TYPEC_CC_RP_DEF || (cc) == TYPEC_CC_RP_1_5 || \
+        (cc) == TYPEC_CC_RP_3_0)
+
+#define tcpm_port_is_sink(port) \
+       ((tcpm_cc_is_sink((port)->cc1) && !tcpm_cc_is_sink((port)->cc2)) || \
+        (tcpm_cc_is_sink((port)->cc2) && !tcpm_cc_is_sink((port)->cc1)))
+
+#define tcpm_cc_is_source(cc) ((cc) == TYPEC_CC_RD)
+#define tcpm_cc_is_audio(cc) ((cc) == TYPEC_CC_RA)
+#define tcpm_cc_is_open(cc) ((cc) == TYPEC_CC_OPEN)
+
+#define tcpm_port_is_source(port) \
+       ((tcpm_cc_is_source((port)->cc1) && \
+        !tcpm_cc_is_source((port)->cc2)) || \
+        (tcpm_cc_is_source((port)->cc2) && \
+         !tcpm_cc_is_source((port)->cc1)))
+
+#define tcpm_port_is_debug(port) \
+       (tcpm_cc_is_source((port)->cc1) && tcpm_cc_is_source((port)->cc2))
+
+#define tcpm_port_is_audio(port) \
+       (tcpm_cc_is_audio((port)->cc1) && tcpm_cc_is_audio((port)->cc2))
+
+#define tcpm_port_is_audio_detached(port) \
+       ((tcpm_cc_is_audio((port)->cc1) && tcpm_cc_is_open((port)->cc2)) || \
+        (tcpm_cc_is_audio((port)->cc2) && tcpm_cc_is_open((port)->cc1)))
+
+#define tcpm_try_snk(port) \
+       ((port)->try_snk_count == 0 && (port)->try_role == TYPEC_SINK && \
+       (port)->port_type == TYPEC_PORT_DRP)
+
+#define tcpm_try_src(port) \
+       ((port)->try_src_count == 0 && (port)->try_role == TYPEC_SOURCE && \
+       (port)->port_type == TYPEC_PORT_DRP)
+
+static enum tcpm_state tcpm_default_state(struct tcpm_port *port)
+{
+       if (port->port_type == TYPEC_PORT_DRP) {
+               if (port->try_role == TYPEC_SINK)
+                       return SNK_UNATTACHED;
+               else if (port->try_role == TYPEC_SOURCE)
+                       return SRC_UNATTACHED;
+               else if (port->tcpc->config->default_role == TYPEC_SINK)
+                       return SNK_UNATTACHED;
+               /* Fall through to return SRC_UNATTACHED */
+       } else if (port->port_type == TYPEC_PORT_SNK) {
+               return SNK_UNATTACHED;
+       }
+       return SRC_UNATTACHED;
+}
+
+static inline
+struct tcpm_port *typec_cap_to_tcpm(const struct typec_capability *cap)
+{
+       return container_of(cap, struct tcpm_port, typec_caps);
+}
+
+static bool tcpm_port_is_disconnected(struct tcpm_port *port)
+{
+       return (!port->attached && port->cc1 == TYPEC_CC_OPEN &&
+               port->cc2 == TYPEC_CC_OPEN) ||
+              (port->attached && ((port->polarity == TYPEC_POLARITY_CC1 &&
+                                   port->cc1 == TYPEC_CC_OPEN) ||
+                                  (port->polarity == TYPEC_POLARITY_CC2 &&
+                                   port->cc2 == TYPEC_CC_OPEN)));
+}
+
+/*
+ * Logging
+ */
+
+#ifdef CONFIG_DEBUG_FS
+
+static bool tcpm_log_full(struct tcpm_port *port)
+{
+       return port->logbuffer_tail ==
+               (port->logbuffer_head + 1) % LOG_BUFFER_ENTRIES;
+}
+
+__printf(2, 0)
+static void _tcpm_log(struct tcpm_port *port, const char *fmt, va_list args)
+{
+       char tmpbuffer[LOG_BUFFER_ENTRY_SIZE];
+       u64 ts_nsec = local_clock();
+       unsigned long rem_nsec;
+
+       mutex_lock(&port->logbuffer_lock);
+       if (!port->logbuffer[port->logbuffer_head]) {
+               port->logbuffer[port->logbuffer_head] =
+                               kzalloc(LOG_BUFFER_ENTRY_SIZE, GFP_KERNEL);
+               if (!port->logbuffer[port->logbuffer_head]) {
+                       mutex_unlock(&port->logbuffer_lock);
+                       return;
+               }
+       }
+
+       vsnprintf(tmpbuffer, sizeof(tmpbuffer), fmt, args);
+
+       if (tcpm_log_full(port)) {
+               port->logbuffer_head = max(port->logbuffer_head - 1, 0);
+               strcpy(tmpbuffer, "overflow");
+       }
+
+       if (port->logbuffer_head < 0 ||
+           port->logbuffer_head >= LOG_BUFFER_ENTRIES) {
+               dev_warn(port->dev,
+                        "Bad log buffer index %d\n", port->logbuffer_head);
+               goto abort;
+       }
+
+       if (!port->logbuffer[port->logbuffer_head]) {
+               dev_warn(port->dev,
+                        "Log buffer index %d is NULL\n", port->logbuffer_head);
+               goto abort;
+       }
+
+       rem_nsec = do_div(ts_nsec, 1000000000);
+       scnprintf(port->logbuffer[port->logbuffer_head],
+                 LOG_BUFFER_ENTRY_SIZE, "[%5lu.%06lu] %s",
+                 (unsigned long)ts_nsec, rem_nsec / 1000,
+                 tmpbuffer);
+       port->logbuffer_head = (port->logbuffer_head + 1) % LOG_BUFFER_ENTRIES;
+
+abort:
+       mutex_unlock(&port->logbuffer_lock);
+}
+
+__printf(2, 3)
+static void tcpm_log(struct tcpm_port *port, const char *fmt, ...)
+{
+       va_list args;
+
+       /* Do not log while disconnected and unattached */
+       if (tcpm_port_is_disconnected(port) &&
+           (port->state == SRC_UNATTACHED || port->state == SNK_UNATTACHED ||
+            port->state == DRP_TOGGLING))
+               return;
+
+       va_start(args, fmt);
+       _tcpm_log(port, fmt, args);
+       va_end(args);
+}
+
+__printf(2, 3)
+static void tcpm_log_force(struct tcpm_port *port, const char *fmt, ...)
+{
+       va_list args;
+
+       va_start(args, fmt);
+       _tcpm_log(port, fmt, args);
+       va_end(args);
+}
+
+static void tcpm_log_source_caps(struct tcpm_port *port)
+{
+       int i;
+
+       for (i = 0; i < port->nr_source_caps; i++) {
+               u32 pdo = port->source_caps[i];
+               enum pd_pdo_type type = pdo_type(pdo);
+               char msg[64];
+
+               switch (type) {
+               case PDO_TYPE_FIXED:
+                       scnprintf(msg, sizeof(msg),
+                                 "%u mV, %u mA [%s%s%s%s%s%s]",
+                                 pdo_fixed_voltage(pdo),
+                                 pdo_max_current(pdo),
+                                 (pdo & PDO_FIXED_DUAL_ROLE) ?
+                                                       "R" : "",
+                                 (pdo & PDO_FIXED_SUSPEND) ?
+                                                       "S" : "",
+                                 (pdo & PDO_FIXED_HIGHER_CAP) ?
+                                                       "H" : "",
+                                 (pdo & PDO_FIXED_USB_COMM) ?
+                                                       "U" : "",
+                                 (pdo & PDO_FIXED_DATA_SWAP) ?
+                                                       "D" : "",
+                                 (pdo & PDO_FIXED_EXTPOWER) ?
+                                                       "E" : "");
+                       break;
+               case PDO_TYPE_VAR:
+                       scnprintf(msg, sizeof(msg),
+                                 "%u-%u mV, %u mA",
+                                 pdo_min_voltage(pdo),
+                                 pdo_max_voltage(pdo),
+                                 pdo_max_current(pdo));
+                       break;
+               case PDO_TYPE_BATT:
+                       scnprintf(msg, sizeof(msg),
+                                 "%u-%u mV, %u mW",
+                                 pdo_min_voltage(pdo),
+                                 pdo_max_voltage(pdo),
+                                 pdo_max_power(pdo));
+                       break;
+               case PDO_TYPE_APDO:
+                       if (pdo_apdo_type(pdo) == APDO_TYPE_PPS)
+                               scnprintf(msg, sizeof(msg),
+                                         "%u-%u mV, %u mA",
+                                         pdo_pps_apdo_min_voltage(pdo),
+                                         pdo_pps_apdo_max_voltage(pdo),
+                                         pdo_pps_apdo_max_current(pdo));
+                       else
+                               strcpy(msg, "undefined APDO");
+                       break;
+               default:
+                       strcpy(msg, "undefined");
+                       break;
+               }
+               tcpm_log(port, " PDO %d: type %d, %s",
+                        i, type, msg);
+       }
+}
+
+static int tcpm_debug_show(struct seq_file *s, void *v)
+{
+       struct tcpm_port *port = (struct tcpm_port *)s->private;
+       int tail;
+
+       mutex_lock(&port->logbuffer_lock);
+       tail = port->logbuffer_tail;
+       while (tail != port->logbuffer_head) {
+               seq_printf(s, "%s\n", port->logbuffer[tail]);
+               tail = (tail + 1) % LOG_BUFFER_ENTRIES;
+       }
+       if (!seq_has_overflowed(s))
+               port->logbuffer_tail = tail;
+       mutex_unlock(&port->logbuffer_lock);
+
+       return 0;
+}
+DEFINE_SHOW_ATTRIBUTE(tcpm_debug);
+
+static struct dentry *rootdir;
+
+static void tcpm_debugfs_init(struct tcpm_port *port)
+{
+       mutex_init(&port->logbuffer_lock);
+       /* /sys/kernel/debug/tcpm/usbcX */
+       if (!rootdir)
+               rootdir = debugfs_create_dir("tcpm", NULL);
+
+       port->dentry = debugfs_create_file(dev_name(port->dev),
+                                          S_IFREG | 0444, rootdir,
+                                          port, &tcpm_debug_fops);
+}
+
+static void tcpm_debugfs_exit(struct tcpm_port *port)
+{
+       debugfs_remove(port->dentry);
+}
+
+#else
+
+__printf(2, 3)
+static void tcpm_log(const struct tcpm_port *port, const char *fmt, ...) { }
+__printf(2, 3)
+static void tcpm_log_force(struct tcpm_port *port, const char *fmt, ...) { }
+static void tcpm_log_source_caps(struct tcpm_port *port) { }
+static void tcpm_debugfs_init(const struct tcpm_port *port) { }
+static void tcpm_debugfs_exit(const struct tcpm_port *port) { }
+
+#endif
+
+static int tcpm_pd_transmit(struct tcpm_port *port,
+                           enum tcpm_transmit_type type,
+                           const struct pd_message *msg)
+{
+       unsigned long timeout;
+       int ret;
+
+       if (msg)
+               tcpm_log(port, "PD TX, header: %#x", le16_to_cpu(msg->header));
+       else
+               tcpm_log(port, "PD TX, type: %#x", type);
+
+       reinit_completion(&port->tx_complete);
+       ret = port->tcpc->pd_transmit(port->tcpc, type, msg);
+       if (ret < 0)
+               return ret;
+
+       mutex_unlock(&port->lock);
+       timeout = wait_for_completion_timeout(&port->tx_complete,
+                               msecs_to_jiffies(PD_T_TCPC_TX_TIMEOUT));
+       mutex_lock(&port->lock);
+       if (!timeout)
+               return -ETIMEDOUT;
+
+       switch (port->tx_status) {
+       case TCPC_TX_SUCCESS:
+               port->message_id = (port->message_id + 1) & PD_HEADER_ID_MASK;
+               return 0;
+       case TCPC_TX_DISCARDED:
+               return -EAGAIN;
+       case TCPC_TX_FAILED:
+       default:
+               return -EIO;
+       }
+}
+
+void tcpm_pd_transmit_complete(struct tcpm_port *port,
+                              enum tcpm_transmit_status status)
+{
+       tcpm_log(port, "PD TX complete, status: %u", status);
+       port->tx_status = status;
+       complete(&port->tx_complete);
+}
+EXPORT_SYMBOL_GPL(tcpm_pd_transmit_complete);
+
+static int tcpm_mux_set(struct tcpm_port *port, int state,
+                       enum usb_role usb_role,
+                       enum typec_orientation orientation)
+{
+       int ret;
+
+       tcpm_log(port, "Requesting mux state %d, usb-role %d, orientation %d",
+                state, usb_role, orientation);
+
+       ret = typec_set_orientation(port->typec_port, orientation);
+       if (ret)
+               return ret;
+
+       if (port->role_sw) {
+               ret = usb_role_switch_set_role(port->role_sw, usb_role);
+               if (ret)
+                       return ret;
+       }
+
+       return typec_set_mode(port->typec_port, state);
+}
+
+static int tcpm_set_polarity(struct tcpm_port *port,
+                            enum typec_cc_polarity polarity)
+{
+       int ret;
+
+       tcpm_log(port, "polarity %d", polarity);
+
+       ret = port->tcpc->set_polarity(port->tcpc, polarity);
+       if (ret < 0)
+               return ret;
+
+       port->polarity = polarity;
+
+       return 0;
+}
+
+static int tcpm_set_vconn(struct tcpm_port *port, bool enable)
+{
+       int ret;
+
+       tcpm_log(port, "vconn:=%d", enable);
+
+       ret = port->tcpc->set_vconn(port->tcpc, enable);
+       if (!ret) {
+               port->vconn_role = enable ? TYPEC_SOURCE : TYPEC_SINK;
+               typec_set_vconn_role(port->typec_port, port->vconn_role);
+       }
+
+       return ret;
+}
+
+static u32 tcpm_get_current_limit(struct tcpm_port *port)
+{
+       enum typec_cc_status cc;
+       u32 limit;
+
+       cc = port->polarity ? port->cc2 : port->cc1;
+       switch (cc) {
+       case TYPEC_CC_RP_1_5:
+               limit = 1500;
+               break;
+       case TYPEC_CC_RP_3_0:
+               limit = 3000;
+               break;
+       case TYPEC_CC_RP_DEF:
+       default:
+               if (port->tcpc->get_current_limit)
+                       limit = port->tcpc->get_current_limit(port->tcpc);
+               else
+                       limit = 0;
+               break;
+       }
+
+       return limit;
+}
+
+static int tcpm_set_current_limit(struct tcpm_port *port, u32 max_ma, u32 mv)
+{
+       int ret = -EOPNOTSUPP;
+
+       tcpm_log(port, "Setting voltage/current limit %u mV %u mA", mv, max_ma);
+
+       port->supply_voltage = mv;
+       port->current_limit = max_ma;
+
+       if (port->tcpc->set_current_limit)
+               ret = port->tcpc->set_current_limit(port->tcpc, max_ma, mv);
+
+       return ret;
+}
+
+/*
+ * Determine RP value to set based on maximum current supported
+ * by a port if configured as source.
+ * Returns CC value to report to link partner.
+ */
+static enum typec_cc_status tcpm_rp_cc(struct tcpm_port *port)
+{
+       const u32 *src_pdo = port->src_pdo;
+       int nr_pdo = port->nr_src_pdo;
+       int i;
+
+       /*
+        * Search for first entry with matching voltage.
+        * It should report the maximum supported current.
+        */
+       for (i = 0; i < nr_pdo; i++) {
+               const u32 pdo = src_pdo[i];
+
+               if (pdo_type(pdo) == PDO_TYPE_FIXED &&
+                   pdo_fixed_voltage(pdo) == 5000) {
+                       unsigned int curr = pdo_max_current(pdo);
+
+                       if (curr >= 3000)
+                               return TYPEC_CC_RP_3_0;
+                       else if (curr >= 1500)
+                               return TYPEC_CC_RP_1_5;
+                       return TYPEC_CC_RP_DEF;
+               }
+       }
+
+       return TYPEC_CC_RP_DEF;
+}
+
+static int tcpm_set_attached_state(struct tcpm_port *port, bool attached)
+{
+       return port->tcpc->set_roles(port->tcpc, attached, port->pwr_role,
+                                    port->data_role);
+}
+
+static int tcpm_set_roles(struct tcpm_port *port, bool attached,
+                         enum typec_role role, enum typec_data_role data)
+{
+       enum typec_orientation orientation;
+       enum usb_role usb_role;
+       int ret;
+
+       if (port->polarity == TYPEC_POLARITY_CC1)
+               orientation = TYPEC_ORIENTATION_NORMAL;
+       else
+               orientation = TYPEC_ORIENTATION_REVERSE;
+
+       if (data == TYPEC_HOST)
+               usb_role = USB_ROLE_HOST;
+       else
+               usb_role = USB_ROLE_DEVICE;
+
+       ret = tcpm_mux_set(port, TYPEC_STATE_USB, usb_role, orientation);
+       if (ret < 0)
+               return ret;
+
+       ret = port->tcpc->set_roles(port->tcpc, attached, role, data);
+       if (ret < 0)
+               return ret;
+
+       port->pwr_role = role;
+       port->data_role = data;
+       typec_set_data_role(port->typec_port, data);
+       typec_set_pwr_role(port->typec_port, role);
+
+       return 0;
+}
+
+static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role)
+{
+       int ret;
+
+       ret = port->tcpc->set_roles(port->tcpc, true, role,
+                                   port->data_role);
+       if (ret < 0)
+               return ret;
+
+       port->pwr_role = role;
+       typec_set_pwr_role(port->typec_port, role);
+
+       return 0;
+}
+
+static int tcpm_pd_send_source_caps(struct tcpm_port *port)
+{
+       struct pd_message msg;
+       int i;
+
+       memset(&msg, 0, sizeof(msg));
+       if (!port->nr_src_pdo) {
+               /* No source capabilities defined, sink only */
+               msg.header = PD_HEADER_LE(PD_CTRL_REJECT,
+                                         port->pwr_role,
+                                         port->data_role,
+                                         port->negotiated_rev,
+                                         port->message_id, 0);
+       } else {
+               msg.header = PD_HEADER_LE(PD_DATA_SOURCE_CAP,
+                                         port->pwr_role,
+                                         port->data_role,
+                                         port->negotiated_rev,
+                                         port->message_id,
+                                         port->nr_src_pdo);
+       }
+       for (i = 0; i < port->nr_src_pdo; i++)
+               msg.payload[i] = cpu_to_le32(port->src_pdo[i]);
+
+       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
+}
+
+static int tcpm_pd_send_sink_caps(struct tcpm_port *port)
+{
+       struct pd_message msg;
+       int i;
+
+       memset(&msg, 0, sizeof(msg));
+       if (!port->nr_snk_pdo) {
+               /* No sink capabilities defined, source only */
+               msg.header = PD_HEADER_LE(PD_CTRL_REJECT,
+                                         port->pwr_role,
+                                         port->data_role,
+                                         port->negotiated_rev,
+                                         port->message_id, 0);
+       } else {
+               msg.header = PD_HEADER_LE(PD_DATA_SINK_CAP,
+                                         port->pwr_role,
+                                         port->data_role,
+                                         port->negotiated_rev,
+                                         port->message_id,
+                                         port->nr_snk_pdo);
+       }
+       for (i = 0; i < port->nr_snk_pdo; i++)
+               msg.payload[i] = cpu_to_le32(port->snk_pdo[i]);
+
+       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
+}
+
+static void tcpm_set_state(struct tcpm_port *port, enum tcpm_state state,
+                          unsigned int delay_ms)
+{
+       if (delay_ms) {
+               tcpm_log(port, "pending state change %s -> %s @ %u ms",
+                        tcpm_states[port->state], tcpm_states[state],
+                        delay_ms);
+               port->delayed_state = state;
+               mod_delayed_work(port->wq, &port->state_machine,
+                                msecs_to_jiffies(delay_ms));
+               port->delayed_runtime = jiffies + msecs_to_jiffies(delay_ms);
+               port->delay_ms = delay_ms;
+       } else {
+               tcpm_log(port, "state change %s -> %s",
+                        tcpm_states[port->state], tcpm_states[state]);
+               port->delayed_state = INVALID_STATE;
+               port->prev_state = port->state;
+               port->state = state;
+               /*
+                * Don't re-queue the state machine work item if we're currently
+                * in the state machine and we're immediately changing states.
+                * tcpm_state_machine_work() will continue running the state
+                * machine.
+                */
+               if (!port->state_machine_running)
+                       mod_delayed_work(port->wq, &port->state_machine, 0);
+       }
+}
+
+static void tcpm_set_state_cond(struct tcpm_port *port, enum tcpm_state state,
+                               unsigned int delay_ms)
+{
+       if (port->enter_state == port->state)
+               tcpm_set_state(port, state, delay_ms);
+       else
+               tcpm_log(port,
+                        "skipped %sstate change %s -> %s [%u ms], context state %s",
+                        delay_ms ? "delayed " : "",
+                        tcpm_states[port->state], tcpm_states[state],
+                        delay_ms, tcpm_states[port->enter_state]);
+}
+
+static void tcpm_queue_message(struct tcpm_port *port,
+                              enum pd_msg_request message)
+{
+       port->queued_message = message;
+       mod_delayed_work(port->wq, &port->state_machine, 0);
+}
+
+/*
+ * VDM/VDO handling functions
+ */
+static void tcpm_queue_vdm(struct tcpm_port *port, const u32 header,
+                          const u32 *data, int cnt)
+{
+       port->vdo_count = cnt + 1;
+       port->vdo_data[0] = header;
+       memcpy(&port->vdo_data[1], data, sizeof(u32) * cnt);
+       /* Set ready, vdm state machine will actually send */
+       port->vdm_retries = 0;
+       port->vdm_state = VDM_STATE_READY;
+}
+
+static void svdm_consume_identity(struct tcpm_port *port, const __le32 *payload,
+                                 int cnt)
+{
+       u32 vdo = le32_to_cpu(payload[VDO_INDEX_IDH]);
+       u32 product = le32_to_cpu(payload[VDO_INDEX_PRODUCT]);
+
+       memset(&port->mode_data, 0, sizeof(port->mode_data));
+
+       port->partner_ident.id_header = vdo;
+       port->partner_ident.cert_stat = le32_to_cpu(payload[VDO_INDEX_CSTAT]);
+       port->partner_ident.product = product;
+
+       typec_partner_set_identity(port->partner);
+
+       tcpm_log(port, "Identity: %04x:%04x.%04x",
+                PD_IDH_VID(vdo),
+                PD_PRODUCT_PID(product), product & 0xffff);
+}
+
+static bool svdm_consume_svids(struct tcpm_port *port, const __le32 *payload,
+                              int cnt)
+{
+       struct pd_mode_data *pmdata = &port->mode_data;
+       int i;
+
+       for (i = 1; i < cnt; i++) {
+               u32 p = le32_to_cpu(payload[i]);
+               u16 svid;
+
+               svid = (p >> 16) & 0xffff;
+               if (!svid)
+                       return false;
+
+               if (pmdata->nsvids >= SVID_DISCOVERY_MAX)
+                       goto abort;
+
+               pmdata->svids[pmdata->nsvids++] = svid;
+               tcpm_log(port, "SVID %d: 0x%x", pmdata->nsvids, svid);
+
+               svid = p & 0xffff;
+               if (!svid)
+                       return false;
+
+               if (pmdata->nsvids >= SVID_DISCOVERY_MAX)
+                       goto abort;
+
+               pmdata->svids[pmdata->nsvids++] = svid;
+               tcpm_log(port, "SVID %d: 0x%x", pmdata->nsvids, svid);
+       }
+       return true;
+abort:
+       tcpm_log(port, "SVID_DISCOVERY_MAX(%d) too low!", SVID_DISCOVERY_MAX);
+       return false;
+}
+
+static void svdm_consume_modes(struct tcpm_port *port, const __le32 *payload,
+                              int cnt)
+{
+       struct pd_mode_data *pmdata = &port->mode_data;
+       struct typec_altmode_desc *paltmode;
+       int i;
+
+       if (pmdata->altmodes >= ARRAY_SIZE(port->partner_altmode)) {
+               /* Already logged in svdm_consume_svids() */
+               return;
+       }
+
+       for (i = 1; i < cnt; i++) {
+               paltmode = &pmdata->altmode_desc[pmdata->altmodes];
+               memset(paltmode, 0, sizeof(*paltmode));
+
+               paltmode->svid = pmdata->svids[pmdata->svid_index];
+               paltmode->mode = i;
+               paltmode->vdo = le32_to_cpu(payload[i]);
+
+               tcpm_log(port, " Alternate mode %d: SVID 0x%04x, VDO %d: 0x%08x",
+                        pmdata->altmodes, paltmode->svid,
+                        paltmode->mode, paltmode->vdo);
+
+               pmdata->altmodes++;
+       }
+}
+
+static void tcpm_register_partner_altmodes(struct tcpm_port *port)
+{
+       struct pd_mode_data *modep = &port->mode_data;
+       struct typec_altmode *altmode;
+       int i;
+
+       for (i = 0; i < modep->altmodes; i++) {
+               altmode = typec_partner_register_altmode(port->partner,
+                                               &modep->altmode_desc[i]);
+               if (!altmode)
+                       tcpm_log(port, "Failed to register partner SVID 0x%04x",
+                                modep->altmode_desc[i].svid);
+               port->partner_altmode[i] = altmode;
+       }
+}
+
+#define supports_modal(port)   PD_IDH_MODAL_SUPP((port)->partner_ident.id_header)
+
+static int tcpm_pd_svdm(struct tcpm_port *port, const __le32 *payload, int cnt,
+                       u32 *response)
+{
+       struct typec_altmode *adev;
+       struct typec_altmode *pdev;
+       struct pd_mode_data *modep;
+       u32 p[PD_MAX_PAYLOAD];
+       int rlen = 0;
+       int cmd_type;
+       int cmd;
+       int i;
+
+       for (i = 0; i < cnt; i++)
+               p[i] = le32_to_cpu(payload[i]);
+
+       cmd_type = PD_VDO_CMDT(p[0]);
+       cmd = PD_VDO_CMD(p[0]);
+
+       tcpm_log(port, "Rx VDM cmd 0x%x type %d cmd %d len %d",
+                p[0], cmd_type, cmd, cnt);
+
+       modep = &port->mode_data;
+
+       adev = typec_match_altmode(port->port_altmode, ALTMODE_DISCOVERY_MAX,
+                                  PD_VDO_VID(p[0]), PD_VDO_OPOS(p[0]));
+
+       pdev = typec_match_altmode(port->partner_altmode, ALTMODE_DISCOVERY_MAX,
+                                  PD_VDO_VID(p[0]), PD_VDO_OPOS(p[0]));
+
+       switch (cmd_type) {
+       case CMDT_INIT:
+               switch (cmd) {
+               case CMD_DISCOVER_IDENT:
+                       /* 6.4.4.3.1: Only respond as UFP (device) */
+                       if (port->data_role == TYPEC_DEVICE &&
+                           port->nr_snk_vdo) {
+                               for (i = 0; i <  port->nr_snk_vdo; i++)
+                                       response[i + 1] = port->snk_vdo[i];
+                               rlen = port->nr_snk_vdo + 1;
+                       }
+                       break;
+               case CMD_DISCOVER_SVID:
+                       break;
+               case CMD_DISCOVER_MODES:
+                       break;
+               case CMD_ENTER_MODE:
+                       break;
+               case CMD_EXIT_MODE:
+                       break;
+               case CMD_ATTENTION:
+                       /* Attention command does not have response */
+                       typec_altmode_attention(adev, p[1]);
+                       return 0;
+               default:
+                       break;
+               }
+               if (rlen >= 1) {
+                       response[0] = p[0] | VDO_CMDT(CMDT_RSP_ACK);
+               } else if (rlen == 0) {
+                       response[0] = p[0] | VDO_CMDT(CMDT_RSP_NAK);
+                       rlen = 1;
+               } else {
+                       response[0] = p[0] | VDO_CMDT(CMDT_RSP_BUSY);
+                       rlen = 1;
+               }
+               break;
+       case CMDT_RSP_ACK:
+               /* silently drop message if we are not connected */
+               if (IS_ERR_OR_NULL(port->partner))
+                       break;
+
+               switch (cmd) {
+               case CMD_DISCOVER_IDENT:
+                       /* 6.4.4.3.1 */
+                       svdm_consume_identity(port, payload, cnt);
+                       response[0] = VDO(USB_SID_PD, 1, CMD_DISCOVER_SVID);
+                       rlen = 1;
+                       break;
+               case CMD_DISCOVER_SVID:
+                       /* 6.4.4.3.2 */
+                       if (svdm_consume_svids(port, payload, cnt)) {
+                               response[0] = VDO(USB_SID_PD, 1,
+                                                 CMD_DISCOVER_SVID);
+                               rlen = 1;
+                       } else if (modep->nsvids && supports_modal(port)) {
+                               response[0] = VDO(modep->svids[0], 1,
+                                                 CMD_DISCOVER_MODES);
+                               rlen = 1;
+                       }
+                       break;
+               case CMD_DISCOVER_MODES:
+                       /* 6.4.4.3.3 */
+                       svdm_consume_modes(port, payload, cnt);
+                       modep->svid_index++;
+                       if (modep->svid_index < modep->nsvids) {
+                               u16 svid = modep->svids[modep->svid_index];
+                               response[0] = VDO(svid, 1, CMD_DISCOVER_MODES);
+                               rlen = 1;
+                       } else {
+                               tcpm_register_partner_altmodes(port);
+                       }
+                       break;
+               case CMD_ENTER_MODE:
+                       typec_altmode_update_active(pdev, true);
+
+                       if (typec_altmode_vdm(adev, p[0], &p[1], cnt)) {
+                               response[0] = VDO(adev->svid, 1, CMD_EXIT_MODE);
+                               response[0] |= VDO_OPOS(adev->mode);
+                               return 1;
+                       }
+                       return 0;
+               case CMD_EXIT_MODE:
+                       typec_altmode_update_active(pdev, false);
+
+                       /* Back to USB Operation */
+                       WARN_ON(typec_altmode_notify(adev, TYPEC_STATE_USB,
+                                                    NULL));
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case CMDT_RSP_NAK:
+               switch (cmd) {
+               case CMD_ENTER_MODE:
+                       /* Back to USB Operation */
+                       WARN_ON(typec_altmode_notify(adev, TYPEC_STATE_USB,
+                                                    NULL));
+                       break;
+               default:
+                       break;
+               }
+               break;
+       default:
+               break;
+       }
+
+       /* Informing the alternate mode drivers about everything */
+       typec_altmode_vdm(adev, p[0], &p[1], cnt);
+
+       return rlen;
+}
+
+static void tcpm_handle_vdm_request(struct tcpm_port *port,
+                                   const __le32 *payload, int cnt)
+{
+       int rlen = 0;
+       u32 response[8] = { };
+       u32 p0 = le32_to_cpu(payload[0]);
+
+       if (port->vdm_state == VDM_STATE_BUSY) {
+               /* If UFP responded busy retry after timeout */
+               if (PD_VDO_CMDT(p0) == CMDT_RSP_BUSY) {
+                       port->vdm_state = VDM_STATE_WAIT_RSP_BUSY;
+                       port->vdo_retry = (p0 & ~VDO_CMDT_MASK) |
+                               CMDT_INIT;
+                       mod_delayed_work(port->wq, &port->vdm_state_machine,
+                                        msecs_to_jiffies(PD_T_VDM_BUSY));
+                       return;
+               }
+               port->vdm_state = VDM_STATE_DONE;
+       }
+
+       if (PD_VDO_SVDM(p0))
+               rlen = tcpm_pd_svdm(port, payload, cnt, response);
+
+       if (rlen > 0) {
+               tcpm_queue_vdm(port, response[0], &response[1], rlen - 1);
+               mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
+       }
+}
+
+static void tcpm_send_vdm(struct tcpm_port *port, u32 vid, int cmd,
+                         const u32 *data, int count)
+{
+       u32 header;
+
+       if (WARN_ON(count > VDO_MAX_SIZE - 1))
+               count = VDO_MAX_SIZE - 1;
+
+       /* set VDM header with VID & CMD */
+       header = VDO(vid, ((vid & USB_SID_PD) == USB_SID_PD) ?
+                       1 : (PD_VDO_CMD(cmd) <= CMD_ATTENTION), cmd);
+       tcpm_queue_vdm(port, header, data, count);
+
+       mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
+}
+
+static unsigned int vdm_ready_timeout(u32 vdm_hdr)
+{
+       unsigned int timeout;
+       int cmd = PD_VDO_CMD(vdm_hdr);
+
+       /* its not a structured VDM command */
+       if (!PD_VDO_SVDM(vdm_hdr))
+               return PD_T_VDM_UNSTRUCTURED;
+
+       switch (PD_VDO_CMDT(vdm_hdr)) {
+       case CMDT_INIT:
+               if (cmd == CMD_ENTER_MODE || cmd == CMD_EXIT_MODE)
+                       timeout = PD_T_VDM_WAIT_MODE_E;
+               else
+                       timeout = PD_T_VDM_SNDR_RSP;
+               break;
+       default:
+               if (cmd == CMD_ENTER_MODE || cmd == CMD_EXIT_MODE)
+                       timeout = PD_T_VDM_E_MODE;
+               else
+                       timeout = PD_T_VDM_RCVR_RSP;
+               break;
+       }
+       return timeout;
+}
+
+static void vdm_run_state_machine(struct tcpm_port *port)
+{
+       struct pd_message msg;
+       int i, res;
+
+       switch (port->vdm_state) {
+       case VDM_STATE_READY:
+               /* Only transmit VDM if attached */
+               if (!port->attached) {
+                       port->vdm_state = VDM_STATE_ERR_BUSY;
+                       break;
+               }
+
+               /*
+                * if there's traffic or we're not in PDO ready state don't send
+                * a VDM.
+                */
+               if (port->state != SRC_READY && port->state != SNK_READY)
+                       break;
+
+               /* Prepare and send VDM */
+               memset(&msg, 0, sizeof(msg));
+               msg.header = PD_HEADER_LE(PD_DATA_VENDOR_DEF,
+                                         port->pwr_role,
+                                         port->data_role,
+                                         port->negotiated_rev,
+                                         port->message_id, port->vdo_count);
+               for (i = 0; i < port->vdo_count; i++)
+                       msg.payload[i] = cpu_to_le32(port->vdo_data[i]);
+               res = tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
+               if (res < 0) {
+                       port->vdm_state = VDM_STATE_ERR_SEND;
+               } else {
+                       unsigned long timeout;
+
+                       port->vdm_retries = 0;
+                       port->vdm_state = VDM_STATE_BUSY;
+                       timeout = vdm_ready_timeout(port->vdo_data[0]);
+                       mod_delayed_work(port->wq, &port->vdm_state_machine,
+                                        timeout);
+               }
+               break;
+       case VDM_STATE_WAIT_RSP_BUSY:
+               port->vdo_data[0] = port->vdo_retry;
+               port->vdo_count = 1;
+               port->vdm_state = VDM_STATE_READY;
+               break;
+       case VDM_STATE_BUSY:
+               port->vdm_state = VDM_STATE_ERR_TMOUT;
+               break;
+       case VDM_STATE_ERR_SEND:
+               /*
+                * A partner which does not support USB PD will not reply,
+                * so this is not a fatal error. At the same time, some
+                * devices may not return GoodCRC under some circumstances,
+                * so we need to retry.
+                */
+               if (port->vdm_retries < 3) {
+                       tcpm_log(port, "VDM Tx error, retry");
+                       port->vdm_retries++;
+                       port->vdm_state = VDM_STATE_READY;
+               }
+               break;
+       default:
+               break;
+       }
+}
+
+static void vdm_state_machine_work(struct work_struct *work)
+{
+       struct tcpm_port *port = container_of(work, struct tcpm_port,
+                                             vdm_state_machine.work);
+       enum vdm_states prev_state;
+
+       mutex_lock(&port->lock);
+
+       /*
+        * Continue running as long as the port is not busy and there was
+        * a state change.
+        */
+       do {
+               prev_state = port->vdm_state;
+               vdm_run_state_machine(port);
+       } while (port->vdm_state != prev_state &&
+                port->vdm_state != VDM_STATE_BUSY);
+
+       mutex_unlock(&port->lock);
+}
+
+enum pdo_err {
+       PDO_NO_ERR,
+       PDO_ERR_NO_VSAFE5V,
+       PDO_ERR_VSAFE5V_NOT_FIRST,
+       PDO_ERR_PDO_TYPE_NOT_IN_ORDER,
+       PDO_ERR_FIXED_NOT_SORTED,
+       PDO_ERR_VARIABLE_BATT_NOT_SORTED,
+       PDO_ERR_DUPE_PDO,
+       PDO_ERR_PPS_APDO_NOT_SORTED,
+       PDO_ERR_DUPE_PPS_APDO,
+};
+
+static const char * const pdo_err_msg[] = {
+       [PDO_ERR_NO_VSAFE5V] =
+       " err: source/sink caps should atleast have vSafe5V",
+       [PDO_ERR_VSAFE5V_NOT_FIRST] =
+       " err: vSafe5V Fixed Supply Object Shall always be the first object",
+       [PDO_ERR_PDO_TYPE_NOT_IN_ORDER] =
+       " err: PDOs should be in the following order: Fixed; Battery; Variable",
+       [PDO_ERR_FIXED_NOT_SORTED] =
+       " err: Fixed supply pdos should be in increasing order of their fixed voltage",
+       [PDO_ERR_VARIABLE_BATT_NOT_SORTED] =
+       " err: Variable/Battery supply pdos should be in increasing order of their minimum voltage",
+       [PDO_ERR_DUPE_PDO] =
+       " err: Variable/Batt supply pdos cannot have same min/max voltage",
+       [PDO_ERR_PPS_APDO_NOT_SORTED] =
+       " err: Programmable power supply apdos should be in increasing order of their maximum voltage",
+       [PDO_ERR_DUPE_PPS_APDO] =
+       " err: Programmable power supply apdos cannot have same min/max voltage and max current",
+};
+
+static enum pdo_err tcpm_caps_err(struct tcpm_port *port, const u32 *pdo,
+                                 unsigned int nr_pdo)
+{
+       unsigned int i;
+
+       /* Should at least contain vSafe5v */
+       if (nr_pdo < 1)
+               return PDO_ERR_NO_VSAFE5V;
+
+       /* The vSafe5V Fixed Supply Object Shall always be the first object */
+       if (pdo_type(pdo[0]) != PDO_TYPE_FIXED ||
+           pdo_fixed_voltage(pdo[0]) != VSAFE5V)
+               return PDO_ERR_VSAFE5V_NOT_FIRST;
+
+       for (i = 1; i < nr_pdo; i++) {
+               if (pdo_type(pdo[i]) < pdo_type(pdo[i - 1])) {
+                       return PDO_ERR_PDO_TYPE_NOT_IN_ORDER;
+               } else if (pdo_type(pdo[i]) == pdo_type(pdo[i - 1])) {
+                       enum pd_pdo_type type = pdo_type(pdo[i]);
+
+                       switch (type) {
+                       /*
+                        * The remaining Fixed Supply Objects, if
+                        * present, shall be sent in voltage order;
+                        * lowest to highest.
+                        */
+                       case PDO_TYPE_FIXED:
+                               if (pdo_fixed_voltage(pdo[i]) <=
+                                   pdo_fixed_voltage(pdo[i - 1]))
+                                       return PDO_ERR_FIXED_NOT_SORTED;
+                               break;
+                       /*
+                        * The Battery Supply Objects and Variable
+                        * supply, if present shall be sent in Minimum
+                        * Voltage order; lowest to highest.
+                        */
+                       case PDO_TYPE_VAR:
+                       case PDO_TYPE_BATT:
+                               if (pdo_min_voltage(pdo[i]) <
+                                   pdo_min_voltage(pdo[i - 1]))
+                                       return PDO_ERR_VARIABLE_BATT_NOT_SORTED;
+                               else if ((pdo_min_voltage(pdo[i]) ==
+                                         pdo_min_voltage(pdo[i - 1])) &&
+                                        (pdo_max_voltage(pdo[i]) ==
+                                         pdo_min_voltage(pdo[i - 1])))
+                                       return PDO_ERR_DUPE_PDO;
+                               break;
+                       /*
+                        * The Programmable Power Supply APDOs, if present,
+                        * shall be sent in Maximum Voltage order;
+                        * lowest to highest.
+                        */
+                       case PDO_TYPE_APDO:
+                               if (pdo_apdo_type(pdo[i]) != APDO_TYPE_PPS)
+                                       break;
+
+                               if (pdo_pps_apdo_max_current(pdo[i]) <
+                                   pdo_pps_apdo_max_current(pdo[i - 1]))
+                                       return PDO_ERR_PPS_APDO_NOT_SORTED;
+                               else if (pdo_pps_apdo_min_voltage(pdo[i]) ==
+                                         pdo_pps_apdo_min_voltage(pdo[i - 1]) &&
+                                        pdo_pps_apdo_max_voltage(pdo[i]) ==
+                                         pdo_pps_apdo_max_voltage(pdo[i - 1]) &&
+                                        pdo_pps_apdo_max_current(pdo[i]) ==
+                                         pdo_pps_apdo_max_current(pdo[i - 1]))
+                                       return PDO_ERR_DUPE_PPS_APDO;
+                               break;
+                       default:
+                               tcpm_log_force(port, " Unknown pdo type");
+                       }
+               }
+       }
+
+       return PDO_NO_ERR;
+}
+
+static int tcpm_validate_caps(struct tcpm_port *port, const u32 *pdo,
+                             unsigned int nr_pdo)
+{
+       enum pdo_err err_index = tcpm_caps_err(port, pdo, nr_pdo);
+
+       if (err_index != PDO_NO_ERR) {
+               tcpm_log_force(port, " %s", pdo_err_msg[err_index]);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int tcpm_altmode_enter(struct typec_altmode *altmode)
+{
+       struct tcpm_port *port = typec_altmode_get_drvdata(altmode);
+       u32 header;
+
+       mutex_lock(&port->lock);
+       header = VDO(altmode->svid, 1, CMD_ENTER_MODE);
+       header |= VDO_OPOS(altmode->mode);
+
+       tcpm_queue_vdm(port, header, NULL, 0);
+       mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
+       mutex_unlock(&port->lock);
+
+       return 0;
+}
+
+static int tcpm_altmode_exit(struct typec_altmode *altmode)
+{
+       struct tcpm_port *port = typec_altmode_get_drvdata(altmode);
+       u32 header;
+
+       mutex_lock(&port->lock);
+       header = VDO(altmode->svid, 1, CMD_EXIT_MODE);
+       header |= VDO_OPOS(altmode->mode);
+
+       tcpm_queue_vdm(port, header, NULL, 0);
+       mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
+       mutex_unlock(&port->lock);
+
+       return 0;
+}
+
+static int tcpm_altmode_vdm(struct typec_altmode *altmode,
+                           u32 header, const u32 *data, int count)
+{
+       struct tcpm_port *port = typec_altmode_get_drvdata(altmode);
+
+       mutex_lock(&port->lock);
+       tcpm_queue_vdm(port, header, data, count - 1);
+       mod_delayed_work(port->wq, &port->vdm_state_machine, 0);
+       mutex_unlock(&port->lock);
+
+       return 0;
+}
+
+static const struct typec_altmode_ops tcpm_altmode_ops = {
+       .enter = tcpm_altmode_enter,
+       .exit = tcpm_altmode_exit,
+       .vdm = tcpm_altmode_vdm,
+};
+
+/*
+ * PD (data, control) command handling functions
+ */
+static inline enum tcpm_state ready_state(struct tcpm_port *port)
+{
+       if (port->pwr_role == TYPEC_SOURCE)
+               return SRC_READY;
+       else
+               return SNK_READY;
+}
+
+static int tcpm_pd_send_control(struct tcpm_port *port,
+                               enum pd_ctrl_msg_type type);
+
+static void tcpm_handle_alert(struct tcpm_port *port, const __le32 *payload,
+                             int cnt)
+{
+       u32 p0 = le32_to_cpu(payload[0]);
+       unsigned int type = usb_pd_ado_type(p0);
+
+       if (!type) {
+               tcpm_log(port, "Alert message received with no type");
+               return;
+       }
+
+       /* Just handling non-battery alerts for now */
+       if (!(type & USB_PD_ADO_TYPE_BATT_STATUS_CHANGE)) {
+               switch (port->state) {
+               case SRC_READY:
+               case SNK_READY:
+                       tcpm_set_state(port, GET_STATUS_SEND, 0);
+                       break;
+               default:
+                       tcpm_queue_message(port, PD_MSG_CTRL_WAIT);
+                       break;
+               }
+       }
+}
+
+static void tcpm_pd_data_request(struct tcpm_port *port,
+                                const struct pd_message *msg)
+{
+       enum pd_data_msg_type type = pd_header_type_le(msg->header);
+       unsigned int cnt = pd_header_cnt_le(msg->header);
+       unsigned int rev = pd_header_rev_le(msg->header);
+       unsigned int i;
+
+       switch (type) {
+       case PD_DATA_SOURCE_CAP:
+               if (port->pwr_role != TYPEC_SINK)
+                       break;
+
+               for (i = 0; i < cnt; i++)
+                       port->source_caps[i] = le32_to_cpu(msg->payload[i]);
+
+               port->nr_source_caps = cnt;
+
+               tcpm_log_source_caps(port);
+
+               tcpm_validate_caps(port, port->source_caps,
+                                  port->nr_source_caps);
+
+               /*
+                * Adjust revision in subsequent message headers, as required,
+                * to comply with 6.2.1.1.5 of the USB PD 3.0 spec. We don't
+                * support Rev 1.0 so just do nothing in that scenario.
+                */
+               if (rev == PD_REV10)
+                       break;
+
+               if (rev < PD_MAX_REV)
+                       port->negotiated_rev = rev;
+
+               /*
+                * This message may be received even if VBUS is not
+                * present. This is quite unexpected; see USB PD
+                * specification, sections 8.3.3.6.3.1 and 8.3.3.6.3.2.
+                * However, at the same time, we must be ready to
+                * receive this message and respond to it 15ms after
+                * receiving PS_RDY during power swap operations, no matter
+                * if VBUS is available or not (USB PD specification,
+                * section 6.5.9.2).
+                * So we need to accept the message either way,
+                * but be prepared to keep waiting for VBUS after it was
+                * handled.
+                */
+               tcpm_set_state(port, SNK_NEGOTIATE_CAPABILITIES, 0);
+               break;
+       case PD_DATA_REQUEST:
+               if (port->pwr_role != TYPEC_SOURCE ||
+                   cnt != 1) {
+                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
+                       break;
+               }
+
+               /*
+                * Adjust revision in subsequent message headers, as required,
+                * to comply with 6.2.1.1.5 of the USB PD 3.0 spec. We don't
+                * support Rev 1.0 so just reject in that scenario.
+                */
+               if (rev == PD_REV10) {
+                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
+                       break;
+               }
+
+               if (rev < PD_MAX_REV)
+                       port->negotiated_rev = rev;
+
+               port->sink_request = le32_to_cpu(msg->payload[0]);
+               tcpm_set_state(port, SRC_NEGOTIATE_CAPABILITIES, 0);
+               break;
+       case PD_DATA_SINK_CAP:
+               /* We don't do anything with this at the moment... */
+               for (i = 0; i < cnt; i++)
+                       port->sink_caps[i] = le32_to_cpu(msg->payload[i]);
+               port->nr_sink_caps = cnt;
+               break;
+       case PD_DATA_VENDOR_DEF:
+               tcpm_handle_vdm_request(port, msg->payload, cnt);
+               break;
+       case PD_DATA_BIST:
+               if (port->state == SRC_READY || port->state == SNK_READY) {
+                       port->bist_request = le32_to_cpu(msg->payload[0]);
+                       tcpm_set_state(port, BIST_RX, 0);
+               }
+               break;
+       case PD_DATA_ALERT:
+               tcpm_handle_alert(port, msg->payload, cnt);
+               break;
+       case PD_DATA_BATT_STATUS:
+       case PD_DATA_GET_COUNTRY_INFO:
+               /* Currently unsupported */
+               tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP);
+               break;
+       default:
+               tcpm_log(port, "Unhandled data message type %#x", type);
+               break;
+       }
+}
+
+static void tcpm_pps_complete(struct tcpm_port *port, int result)
+{
+       if (port->pps_pending) {
+               port->pps_status = result;
+               port->pps_pending = false;
+               complete(&port->pps_complete);
+       }
+}
+
+static void tcpm_pd_ctrl_request(struct tcpm_port *port,
+                                const struct pd_message *msg)
+{
+       enum pd_ctrl_msg_type type = pd_header_type_le(msg->header);
+       enum tcpm_state next_state;
+
+       switch (type) {
+       case PD_CTRL_GOOD_CRC:
+       case PD_CTRL_PING:
+               break;
+       case PD_CTRL_GET_SOURCE_CAP:
+               switch (port->state) {
+               case SRC_READY:
+               case SNK_READY:
+                       tcpm_queue_message(port, PD_MSG_DATA_SOURCE_CAP);
+                       break;
+               default:
+                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
+                       break;
+               }
+               break;
+       case PD_CTRL_GET_SINK_CAP:
+               switch (port->state) {
+               case SRC_READY:
+               case SNK_READY:
+                       tcpm_queue_message(port, PD_MSG_DATA_SINK_CAP);
+                       break;
+               default:
+                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
+                       break;
+               }
+               break;
+       case PD_CTRL_GOTO_MIN:
+               break;
+       case PD_CTRL_PS_RDY:
+               switch (port->state) {
+               case SNK_TRANSITION_SINK:
+                       if (port->vbus_present) {
+                               tcpm_set_current_limit(port,
+                                                      port->current_limit,
+                                                      port->supply_voltage);
+                               port->explicit_contract = true;
+                               tcpm_set_state(port, SNK_READY, 0);
+                       } else {
+                               /*
+                                * Seen after power swap. Keep waiting for VBUS
+                                * in a transitional state.
+                                */
+                               tcpm_set_state(port,
+                                              SNK_TRANSITION_SINK_VBUS, 0);
+                       }
+                       break;
+               case PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED:
+                       tcpm_set_state(port, PR_SWAP_SRC_SNK_SINK_ON, 0);
+                       break;
+               case PR_SWAP_SNK_SRC_SINK_OFF:
+                       tcpm_set_state(port, PR_SWAP_SNK_SRC_SOURCE_ON, 0);
+                       break;
+               case VCONN_SWAP_WAIT_FOR_VCONN:
+                       tcpm_set_state(port, VCONN_SWAP_TURN_OFF_VCONN, 0);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case PD_CTRL_REJECT:
+       case PD_CTRL_WAIT:
+       case PD_CTRL_NOT_SUPP:
+               switch (port->state) {
+               case SNK_NEGOTIATE_CAPABILITIES:
+                       /* USB PD specification, Figure 8-43 */
+                       if (port->explicit_contract)
+                               next_state = SNK_READY;
+                       else
+                               next_state = SNK_WAIT_CAPABILITIES;
+                       tcpm_set_state(port, next_state, 0);
+                       break;
+               case SNK_NEGOTIATE_PPS_CAPABILITIES:
+                       /* Revert data back from any requested PPS updates */
+                       port->pps_data.out_volt = port->supply_voltage;
+                       port->pps_data.op_curr = port->current_limit;
+                       port->pps_status = (type == PD_CTRL_WAIT ?
+                                           -EAGAIN : -EOPNOTSUPP);
+                       tcpm_set_state(port, SNK_READY, 0);
+                       break;
+               case DR_SWAP_SEND:
+                       port->swap_status = (type == PD_CTRL_WAIT ?
+                                            -EAGAIN : -EOPNOTSUPP);
+                       tcpm_set_state(port, DR_SWAP_CANCEL, 0);
+                       break;
+               case PR_SWAP_SEND:
+                       port->swap_status = (type == PD_CTRL_WAIT ?
+                                            -EAGAIN : -EOPNOTSUPP);
+                       tcpm_set_state(port, PR_SWAP_CANCEL, 0);
+                       break;
+               case VCONN_SWAP_SEND:
+                       port->swap_status = (type == PD_CTRL_WAIT ?
+                                            -EAGAIN : -EOPNOTSUPP);
+                       tcpm_set_state(port, VCONN_SWAP_CANCEL, 0);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case PD_CTRL_ACCEPT:
+               switch (port->state) {
+               case SNK_NEGOTIATE_CAPABILITIES:
+                       port->pps_data.active = false;
+                       tcpm_set_state(port, SNK_TRANSITION_SINK, 0);
+                       break;
+               case SNK_NEGOTIATE_PPS_CAPABILITIES:
+                       port->pps_data.active = true;
+                       port->supply_voltage = port->pps_data.out_volt;
+                       port->current_limit = port->pps_data.op_curr;
+                       tcpm_set_state(port, SNK_TRANSITION_SINK, 0);
+                       break;
+               case SOFT_RESET_SEND:
+                       port->message_id = 0;
+                       port->rx_msgid = -1;
+                       if (port->pwr_role == TYPEC_SOURCE)
+                               next_state = SRC_SEND_CAPABILITIES;
+                       else
+                               next_state = SNK_WAIT_CAPABILITIES;
+                       tcpm_set_state(port, next_state, 0);
+                       break;
+               case DR_SWAP_SEND:
+                       tcpm_set_state(port, DR_SWAP_CHANGE_DR, 0);
+                       break;
+               case PR_SWAP_SEND:
+                       tcpm_set_state(port, PR_SWAP_START, 0);
+                       break;
+               case VCONN_SWAP_SEND:
+                       tcpm_set_state(port, VCONN_SWAP_START, 0);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case PD_CTRL_SOFT_RESET:
+               tcpm_set_state(port, SOFT_RESET, 0);
+               break;
+       case PD_CTRL_DR_SWAP:
+               if (port->port_type != TYPEC_PORT_DRP) {
+                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
+                       break;
+               }
+               /*
+                * XXX
+                * 6.3.9: If an alternate mode is active, a request to swap
+                * alternate modes shall trigger a port reset.
+                */
+               switch (port->state) {
+               case SRC_READY:
+               case SNK_READY:
+                       tcpm_set_state(port, DR_SWAP_ACCEPT, 0);
+                       break;
+               default:
+                       tcpm_queue_message(port, PD_MSG_CTRL_WAIT);
+                       break;
+               }
+               break;
+       case PD_CTRL_PR_SWAP:
+               if (port->port_type != TYPEC_PORT_DRP) {
+                       tcpm_queue_message(port, PD_MSG_CTRL_REJECT);
+                       break;
+               }
+               switch (port->state) {
+               case SRC_READY:
+               case SNK_READY:
+                       tcpm_set_state(port, PR_SWAP_ACCEPT, 0);
+                       break;
+               default:
+                       tcpm_queue_message(port, PD_MSG_CTRL_WAIT);
+                       break;
+               }
+               break;
+       case PD_CTRL_VCONN_SWAP:
+               switch (port->state) {
+               case SRC_READY:
+               case SNK_READY:
+                       tcpm_set_state(port, VCONN_SWAP_ACCEPT, 0);
+                       break;
+               default:
+                       tcpm_queue_message(port, PD_MSG_CTRL_WAIT);
+                       break;
+               }
+               break;
+       case PD_CTRL_GET_SOURCE_CAP_EXT:
+       case PD_CTRL_GET_STATUS:
+       case PD_CTRL_FR_SWAP:
+       case PD_CTRL_GET_PPS_STATUS:
+       case PD_CTRL_GET_COUNTRY_CODES:
+               /* Currently not supported */
+               tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP);
+               break;
+       default:
+               tcpm_log(port, "Unhandled ctrl message type %#x", type);
+               break;
+       }
+}
+
+static void tcpm_pd_ext_msg_request(struct tcpm_port *port,
+                                   const struct pd_message *msg)
+{
+       enum pd_ext_msg_type type = pd_header_type_le(msg->header);
+       unsigned int data_size = pd_ext_header_data_size_le(msg->ext_msg.header);
+
+       if (!(msg->ext_msg.header & PD_EXT_HDR_CHUNKED)) {
+               tcpm_log(port, "Unchunked extended messages unsupported");
+               return;
+       }
+
+       if (data_size > PD_EXT_MAX_CHUNK_DATA) {
+               tcpm_log(port, "Chunk handling not yet supported");
+               return;
+       }
+
+       switch (type) {
+       case PD_EXT_STATUS:
+               /*
+                * If PPS related events raised then get PPS status to clear
+                * (see USB PD 3.0 Spec, 6.5.2.4)
+                */
+               if (msg->ext_msg.data[USB_PD_EXT_SDB_EVENT_FLAGS] &
+                   USB_PD_EXT_SDB_PPS_EVENTS)
+                       tcpm_set_state(port, GET_PPS_STATUS_SEND, 0);
+               else
+                       tcpm_set_state(port, ready_state(port), 0);
+               break;
+       case PD_EXT_PPS_STATUS:
+               /*
+                * For now the PPS status message is used to clear events
+                * and nothing more.
+                */
+               tcpm_set_state(port, ready_state(port), 0);
+               break;
+       case PD_EXT_SOURCE_CAP_EXT:
+       case PD_EXT_GET_BATT_CAP:
+       case PD_EXT_GET_BATT_STATUS:
+       case PD_EXT_BATT_CAP:
+       case PD_EXT_GET_MANUFACTURER_INFO:
+       case PD_EXT_MANUFACTURER_INFO:
+       case PD_EXT_SECURITY_REQUEST:
+       case PD_EXT_SECURITY_RESPONSE:
+       case PD_EXT_FW_UPDATE_REQUEST:
+       case PD_EXT_FW_UPDATE_RESPONSE:
+       case PD_EXT_COUNTRY_INFO:
+       case PD_EXT_COUNTRY_CODES:
+               tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP);
+               break;
+       default:
+               tcpm_log(port, "Unhandled extended message type %#x", type);
+               break;
+       }
+}
+
+static void tcpm_pd_rx_handler(struct work_struct *work)
+{
+       struct pd_rx_event *event = container_of(work,
+                                                struct pd_rx_event, work);
+       const struct pd_message *msg = &event->msg;
+       unsigned int cnt = pd_header_cnt_le(msg->header);
+       struct tcpm_port *port = event->port;
+
+       mutex_lock(&port->lock);
+
+       tcpm_log(port, "PD RX, header: %#x [%d]", le16_to_cpu(msg->header),
+                port->attached);
+
+       if (port->attached) {
+               enum pd_ctrl_msg_type type = pd_header_type_le(msg->header);
+               unsigned int msgid = pd_header_msgid_le(msg->header);
+
+               /*
+                * USB PD standard, 6.6.1.2:
+                * "... if MessageID value in a received Message is the
+                * same as the stored value, the receiver shall return a
+                * GoodCRC Message with that MessageID value and drop
+                * the Message (this is a retry of an already received
+                * Message). Note: this shall not apply to the Soft_Reset
+                * Message which always has a MessageID value of zero."
+                */
+               if (msgid == port->rx_msgid && type != PD_CTRL_SOFT_RESET)
+                       goto done;
+               port->rx_msgid = msgid;
+
+               /*
+                * If both ends believe to be DFP/host, we have a data role
+                * mismatch.
+                */
+               if (!!(le16_to_cpu(msg->header) & PD_HEADER_DATA_ROLE) ==
+                   (port->data_role == TYPEC_HOST)) {
+                       tcpm_log(port,
+                                "Data role mismatch, initiating error recovery");
+                       tcpm_set_state(port, ERROR_RECOVERY, 0);
+               } else {
+                       if (msg->header & PD_HEADER_EXT_HDR)
+                               tcpm_pd_ext_msg_request(port, msg);
+                       else if (cnt)
+                               tcpm_pd_data_request(port, msg);
+                       else
+                               tcpm_pd_ctrl_request(port, msg);
+               }
+       }
+
+done:
+       mutex_unlock(&port->lock);
+       kfree(event);
+}
+
+void tcpm_pd_receive(struct tcpm_port *port, const struct pd_message *msg)
+{
+       struct pd_rx_event *event;
+
+       event = kzalloc(sizeof(*event), GFP_ATOMIC);
+       if (!event)
+               return;
+
+       INIT_WORK(&event->work, tcpm_pd_rx_handler);
+       event->port = port;
+       memcpy(&event->msg, msg, sizeof(*msg));
+       queue_work(port->wq, &event->work);
+}
+EXPORT_SYMBOL_GPL(tcpm_pd_receive);
+
+static int tcpm_pd_send_control(struct tcpm_port *port,
+                               enum pd_ctrl_msg_type type)
+{
+       struct pd_message msg;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.header = PD_HEADER_LE(type, port->pwr_role,
+                                 port->data_role,
+                                 port->negotiated_rev,
+                                 port->message_id, 0);
+
+       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
+}
+
+/*
+ * Send queued message without affecting state.
+ * Return true if state machine should go back to sleep,
+ * false otherwise.
+ */
+static bool tcpm_send_queued_message(struct tcpm_port *port)
+{
+       enum pd_msg_request queued_message;
+
+       do {
+               queued_message = port->queued_message;
+               port->queued_message = PD_MSG_NONE;
+
+               switch (queued_message) {
+               case PD_MSG_CTRL_WAIT:
+                       tcpm_pd_send_control(port, PD_CTRL_WAIT);
+                       break;
+               case PD_MSG_CTRL_REJECT:
+                       tcpm_pd_send_control(port, PD_CTRL_REJECT);
+                       break;
+               case PD_MSG_CTRL_NOT_SUPP:
+                       tcpm_pd_send_control(port, PD_CTRL_NOT_SUPP);
+                       break;
+               case PD_MSG_DATA_SINK_CAP:
+                       tcpm_pd_send_sink_caps(port);
+                       break;
+               case PD_MSG_DATA_SOURCE_CAP:
+                       tcpm_pd_send_source_caps(port);
+                       break;
+               default:
+                       break;
+               }
+       } while (port->queued_message != PD_MSG_NONE);
+
+       if (port->delayed_state != INVALID_STATE) {
+               if (time_is_after_jiffies(port->delayed_runtime)) {
+                       mod_delayed_work(port->wq, &port->state_machine,
+                                        port->delayed_runtime - jiffies);
+                       return true;
+               }
+               port->delayed_state = INVALID_STATE;
+       }
+       return false;
+}
+
+static int tcpm_pd_check_request(struct tcpm_port *port)
+{
+       u32 pdo, rdo = port->sink_request;
+       unsigned int max, op, pdo_max, index;
+       enum pd_pdo_type type;
+
+       index = rdo_index(rdo);
+       if (!index || index > port->nr_src_pdo)
+               return -EINVAL;
+
+       pdo = port->src_pdo[index - 1];
+       type = pdo_type(pdo);
+       switch (type) {
+       case PDO_TYPE_FIXED:
+       case PDO_TYPE_VAR:
+               max = rdo_max_current(rdo);
+               op = rdo_op_current(rdo);
+               pdo_max = pdo_max_current(pdo);
+
+               if (op > pdo_max)
+                       return -EINVAL;
+               if (max > pdo_max && !(rdo & RDO_CAP_MISMATCH))
+                       return -EINVAL;
+
+               if (type == PDO_TYPE_FIXED)
+                       tcpm_log(port,
+                                "Requested %u mV, %u mA for %u / %u mA",
+                                pdo_fixed_voltage(pdo), pdo_max, op, max);
+               else
+                       tcpm_log(port,
+                                "Requested %u -> %u mV, %u mA for %u / %u mA",
+                                pdo_min_voltage(pdo), pdo_max_voltage(pdo),
+                                pdo_max, op, max);
+               break;
+       case PDO_TYPE_BATT:
+               max = rdo_max_power(rdo);
+               op = rdo_op_power(rdo);
+               pdo_max = pdo_max_power(pdo);
+
+               if (op > pdo_max)
+                       return -EINVAL;
+               if (max > pdo_max && !(rdo & RDO_CAP_MISMATCH))
+                       return -EINVAL;
+               tcpm_log(port,
+                        "Requested %u -> %u mV, %u mW for %u / %u mW",
+                        pdo_min_voltage(pdo), pdo_max_voltage(pdo),
+                        pdo_max, op, max);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       port->op_vsafe5v = index == 1;
+
+       return 0;
+}
+
+#define min_power(x, y) min(pdo_max_power(x), pdo_max_power(y))
+#define min_current(x, y) min(pdo_max_current(x), pdo_max_current(y))
+
+static int tcpm_pd_select_pdo(struct tcpm_port *port, int *sink_pdo,
+                             int *src_pdo)
+{
+       unsigned int i, j, max_src_mv = 0, min_src_mv = 0, max_mw = 0,
+                    max_mv = 0, src_mw = 0, src_ma = 0, max_snk_mv = 0,
+                    min_snk_mv = 0;
+       int ret = -EINVAL;
+
+       port->pps_data.supported = false;
+       port->usb_type = POWER_SUPPLY_USB_TYPE_PD;
+
+       /*
+        * Select the source PDO providing the most power which has a
+        * matchig sink cap.
+        */
+       for (i = 0; i < port->nr_source_caps; i++) {
+               u32 pdo = port->source_caps[i];
+               enum pd_pdo_type type = pdo_type(pdo);
+
+               switch (type) {
+               case PDO_TYPE_FIXED:
+                       max_src_mv = pdo_fixed_voltage(pdo);
+                       min_src_mv = max_src_mv;
+                       break;
+               case PDO_TYPE_BATT:
+               case PDO_TYPE_VAR:
+                       max_src_mv = pdo_max_voltage(pdo);
+                       min_src_mv = pdo_min_voltage(pdo);
+                       break;
+               case PDO_TYPE_APDO:
+                       if (pdo_apdo_type(pdo) == APDO_TYPE_PPS) {
+                               port->pps_data.supported = true;
+                               port->usb_type =
+                                       POWER_SUPPLY_USB_TYPE_PD_PPS;
+                       }
+                       continue;
+               default:
+                       tcpm_log(port, "Invalid source PDO type, ignoring");
+                       continue;
+               }
+
+               switch (type) {
+               case PDO_TYPE_FIXED:
+               case PDO_TYPE_VAR:
+                       src_ma = pdo_max_current(pdo);
+                       src_mw = src_ma * min_src_mv / 1000;
+                       break;
+               case PDO_TYPE_BATT:
+                       src_mw = pdo_max_power(pdo);
+                       break;
+               case PDO_TYPE_APDO:
+                       continue;
+               default:
+                       tcpm_log(port, "Invalid source PDO type, ignoring");
+                       continue;
+               }
+
+               for (j = 0; j < port->nr_snk_pdo; j++) {
+                       pdo = port->snk_pdo[j];
+
+                       switch (pdo_type(pdo)) {
+                       case PDO_TYPE_FIXED:
+                               max_snk_mv = pdo_fixed_voltage(pdo);
+                               min_snk_mv = max_snk_mv;
+                               break;
+                       case PDO_TYPE_BATT:
+                       case PDO_TYPE_VAR:
+                               max_snk_mv = pdo_max_voltage(pdo);
+                               min_snk_mv = pdo_min_voltage(pdo);
+                               break;
+                       case PDO_TYPE_APDO:
+                               continue;
+                       default:
+                               tcpm_log(port, "Invalid sink PDO type, ignoring");
+                               continue;
+                       }
+
+                       if (max_src_mv <= max_snk_mv &&
+                               min_src_mv >= min_snk_mv) {
+                               /* Prefer higher voltages if available */
+                               if ((src_mw == max_mw && min_src_mv > max_mv) ||
+                                                       src_mw > max_mw) {
+                                       *src_pdo = i;
+                                       *sink_pdo = j;
+                                       max_mw = src_mw;
+                                       max_mv = min_src_mv;
+                                       ret = 0;
+                               }
+                       }
+               }
+       }
+
+       return ret;
+}
+
+#define min_pps_apdo_current(x, y)     \
+       min(pdo_pps_apdo_max_current(x), pdo_pps_apdo_max_current(y))
+
+static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port)
+{
+       unsigned int i, j, max_mw = 0, max_mv = 0;
+       unsigned int min_src_mv, max_src_mv, src_ma, src_mw;
+       unsigned int min_snk_mv, max_snk_mv, snk_ma;
+       u32 pdo;
+       unsigned int src_pdo = 0, snk_pdo = 0;
+
+       /*
+        * Select the source PPS APDO providing the most power while staying
+        * within the board's limits. We skip the first PDO as this is always
+        * 5V 3A.
+        */
+       for (i = 1; i < port->nr_source_caps; ++i) {
+               pdo = port->source_caps[i];
+
+               switch (pdo_type(pdo)) {
+               case PDO_TYPE_APDO:
+                       if (pdo_apdo_type(pdo) != APDO_TYPE_PPS) {
+                               tcpm_log(port, "Not PPS APDO (source), ignoring");
+                               continue;
+                       }
+
+                       min_src_mv = pdo_pps_apdo_min_voltage(pdo);
+                       max_src_mv = pdo_pps_apdo_max_voltage(pdo);
+                       src_ma = pdo_pps_apdo_max_current(pdo);
+                       src_mw = (src_ma * max_src_mv) / 1000;
+
+                       /*
+                        * Now search through the sink PDOs to find a matching
+                        * PPS APDO. Again skip the first sink PDO as this will
+                        * always be 5V 3A.
+                        */
+                       for (j = 1; j < port->nr_snk_pdo; j++) {
+                               pdo = port->snk_pdo[j];
+
+                               switch (pdo_type(pdo)) {
+                               case PDO_TYPE_APDO:
+                                       if (pdo_apdo_type(pdo) != APDO_TYPE_PPS) {
+                                               tcpm_log(port,
+                                                        "Not PPS APDO (sink), ignoring");
+                                               continue;
+                                       }
+
+                                       min_snk_mv =
+                                               pdo_pps_apdo_min_voltage(pdo);
+                                       max_snk_mv =
+                                               pdo_pps_apdo_max_voltage(pdo);
+                                       snk_ma =
+                                               pdo_pps_apdo_max_current(pdo);
+                                       break;
+                               default:
+                                       tcpm_log(port,
+                                                "Not APDO type (sink), ignoring");
+                                       continue;
+                               }
+
+                               if (max_src_mv <= max_snk_mv &&
+                                   min_src_mv >= min_snk_mv) {
+                                       /* Prefer higher voltages if available */
+                                       if ((src_mw == max_mw &&
+                                            min_src_mv > max_mv) ||
+                                           src_mw > max_mw) {
+                                               src_pdo = i;
+                                               snk_pdo = j;
+                                               max_mw = src_mw;
+                                               max_mv = max_src_mv;
+                                       }
+                               }
+                       }
+
+                       break;
+               default:
+                       tcpm_log(port, "Not APDO type (source), ignoring");
+                       continue;
+               }
+       }
+
+       if (src_pdo) {
+               pdo = port->source_caps[src_pdo];
+
+               port->pps_data.min_volt = pdo_pps_apdo_min_voltage(pdo);
+               port->pps_data.max_volt = pdo_pps_apdo_max_voltage(pdo);
+               port->pps_data.max_curr =
+                       min_pps_apdo_current(pdo, port->snk_pdo[snk_pdo]);
+               port->pps_data.out_volt =
+                       min(pdo_pps_apdo_max_voltage(pdo), port->pps_data.out_volt);
+               port->pps_data.op_curr =
+                       min(port->pps_data.max_curr, port->pps_data.op_curr);
+       }
+
+       return src_pdo;
+}
+
+static int tcpm_pd_build_request(struct tcpm_port *port, u32 *rdo)
+{
+       unsigned int mv, ma, mw, flags;
+       unsigned int max_ma, max_mw;
+       enum pd_pdo_type type;
+       u32 pdo, matching_snk_pdo;
+       int src_pdo_index = 0;
+       int snk_pdo_index = 0;
+       int ret;
+
+       ret = tcpm_pd_select_pdo(port, &snk_pdo_index, &src_pdo_index);
+       if (ret < 0)
+               return ret;
+
+       pdo = port->source_caps[src_pdo_index];
+       matching_snk_pdo = port->snk_pdo[snk_pdo_index];
+       type = pdo_type(pdo);
+
+       switch (type) {
+       case PDO_TYPE_FIXED:
+               mv = pdo_fixed_voltage(pdo);
+               break;
+       case PDO_TYPE_BATT:
+       case PDO_TYPE_VAR:
+               mv = pdo_min_voltage(pdo);
+               break;
+       default:
+               tcpm_log(port, "Invalid PDO selected!");
+               return -EINVAL;
+       }
+
+       /* Select maximum available current within the sink pdo's limit */
+       if (type == PDO_TYPE_BATT) {
+               mw = min_power(pdo, matching_snk_pdo);
+               ma = 1000 * mw / mv;
+       } else {
+               ma = min_current(pdo, matching_snk_pdo);
+               mw = ma * mv / 1000;
+       }
+
+       flags = RDO_USB_COMM | RDO_NO_SUSPEND;
+
+       /* Set mismatch bit if offered power is less than operating power */
+       max_ma = ma;
+       max_mw = mw;
+       if (mw < port->operating_snk_mw) {
+               flags |= RDO_CAP_MISMATCH;
+               if (type == PDO_TYPE_BATT &&
+                   (pdo_max_power(matching_snk_pdo) > pdo_max_power(pdo)))
+                       max_mw = pdo_max_power(matching_snk_pdo);
+               else if (pdo_max_current(matching_snk_pdo) >
+                        pdo_max_current(pdo))
+                       max_ma = pdo_max_current(matching_snk_pdo);
+       }
+
+       tcpm_log(port, "cc=%d cc1=%d cc2=%d vbus=%d vconn=%s polarity=%d",
+                port->cc_req, port->cc1, port->cc2, port->vbus_source,
+                port->vconn_role == TYPEC_SOURCE ? "source" : "sink",
+                port->polarity);
+
+       if (type == PDO_TYPE_BATT) {
+               *rdo = RDO_BATT(src_pdo_index + 1, mw, max_mw, flags);
+
+               tcpm_log(port, "Requesting PDO %d: %u mV, %u mW%s",
+                        src_pdo_index, mv, mw,
+                        flags & RDO_CAP_MISMATCH ? " [mismatch]" : "");
+       } else {
+               *rdo = RDO_FIXED(src_pdo_index + 1, ma, max_ma, flags);
+
+               tcpm_log(port, "Requesting PDO %d: %u mV, %u mA%s",
+                        src_pdo_index, mv, ma,
+                        flags & RDO_CAP_MISMATCH ? " [mismatch]" : "");
+       }
+
+       port->current_limit = ma;
+       port->supply_voltage = mv;
+
+       return 0;
+}
+
+static int tcpm_pd_send_request(struct tcpm_port *port)
+{
+       struct pd_message msg;
+       int ret;
+       u32 rdo;
+
+       ret = tcpm_pd_build_request(port, &rdo);
+       if (ret < 0)
+               return ret;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.header = PD_HEADER_LE(PD_DATA_REQUEST,
+                                 port->pwr_role,
+                                 port->data_role,
+                                 port->negotiated_rev,
+                                 port->message_id, 1);
+       msg.payload[0] = cpu_to_le32(rdo);
+
+       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
+}
+
+static int tcpm_pd_build_pps_request(struct tcpm_port *port, u32 *rdo)
+{
+       unsigned int out_mv, op_ma, op_mw, min_mv, max_mv, max_ma, flags;
+       enum pd_pdo_type type;
+       unsigned int src_pdo_index;
+       u32 pdo;
+
+       src_pdo_index = tcpm_pd_select_pps_apdo(port);
+       if (!src_pdo_index)
+               return -EOPNOTSUPP;
+
+       pdo = port->source_caps[src_pdo_index];
+       type = pdo_type(pdo);
+
+       switch (type) {
+       case PDO_TYPE_APDO:
+               if (pdo_apdo_type(pdo) != APDO_TYPE_PPS) {
+                       tcpm_log(port, "Invalid APDO selected!");
+                       return -EINVAL;
+               }
+               min_mv = port->pps_data.min_volt;
+               max_mv = port->pps_data.max_volt;
+               max_ma = port->pps_data.max_curr;
+               out_mv = port->pps_data.out_volt;
+               op_ma = port->pps_data.op_curr;
+               break;
+       default:
+               tcpm_log(port, "Invalid PDO selected!");
+               return -EINVAL;
+       }
+
+       flags = RDO_USB_COMM | RDO_NO_SUSPEND;
+
+       op_mw = (op_ma * out_mv) / 1000;
+       if (op_mw < port->operating_snk_mw) {
+               /*
+                * Try raising current to meet power needs. If that's not enough
+                * then try upping the voltage. If that's still not enough
+                * then we've obviously chosen a PPS APDO which really isn't
+                * suitable so abandon ship.
+                */
+               op_ma = (port->operating_snk_mw * 1000) / out_mv;
+               if ((port->operating_snk_mw * 1000) % out_mv)
+                       ++op_ma;
+               op_ma += RDO_PROG_CURR_MA_STEP - (op_ma % RDO_PROG_CURR_MA_STEP);
+
+               if (op_ma > max_ma) {
+                       op_ma = max_ma;
+                       out_mv = (port->operating_snk_mw * 1000) / op_ma;
+                       if ((port->operating_snk_mw * 1000) % op_ma)
+                               ++out_mv;
+                       out_mv += RDO_PROG_VOLT_MV_STEP -
+                                 (out_mv % RDO_PROG_VOLT_MV_STEP);
+
+                       if (out_mv > max_mv) {
+                               tcpm_log(port, "Invalid PPS APDO selected!");
+                               return -EINVAL;
+                       }
+               }
+       }
+
+       tcpm_log(port, "cc=%d cc1=%d cc2=%d vbus=%d vconn=%s polarity=%d",
+                port->cc_req, port->cc1, port->cc2, port->vbus_source,
+                port->vconn_role == TYPEC_SOURCE ? "source" : "sink",
+                port->polarity);
+
+       *rdo = RDO_PROG(src_pdo_index + 1, out_mv, op_ma, flags);
+
+       tcpm_log(port, "Requesting APDO %d: %u mV, %u mA",
+                src_pdo_index, out_mv, op_ma);
+
+       port->pps_data.op_curr = op_ma;
+       port->pps_data.out_volt = out_mv;
+
+       return 0;
+}
+
+static int tcpm_pd_send_pps_request(struct tcpm_port *port)
+{
+       struct pd_message msg;
+       int ret;
+       u32 rdo;
+
+       ret = tcpm_pd_build_pps_request(port, &rdo);
+       if (ret < 0)
+               return ret;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.header = PD_HEADER_LE(PD_DATA_REQUEST,
+                                 port->pwr_role,
+                                 port->data_role,
+                                 port->negotiated_rev,
+                                 port->message_id, 1);
+       msg.payload[0] = cpu_to_le32(rdo);
+
+       return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg);
+}
+
+static int tcpm_set_vbus(struct tcpm_port *port, bool enable)
+{
+       int ret;
+
+       if (enable && port->vbus_charge)
+               return -EINVAL;
+
+       tcpm_log(port, "vbus:=%d charge=%d", enable, port->vbus_charge);
+
+       ret = port->tcpc->set_vbus(port->tcpc, enable, port->vbus_charge);
+       if (ret < 0)
+               return ret;
+
+       port->vbus_source = enable;
+       return 0;
+}
+
+static int tcpm_set_charge(struct tcpm_port *port, bool charge)
+{
+       int ret;
+
+       if (charge && port->vbus_source)
+               return -EINVAL;
+
+       if (charge != port->vbus_charge) {
+               tcpm_log(port, "vbus=%d charge:=%d", port->vbus_source, charge);
+               ret = port->tcpc->set_vbus(port->tcpc, port->vbus_source,
+                                          charge);
+               if (ret < 0)
+                       return ret;
+       }
+       port->vbus_charge = charge;
+       return 0;
+}
+
+static bool tcpm_start_drp_toggling(struct tcpm_port *port,
+                                   enum typec_cc_status cc)
+{
+       int ret;
+
+       if (port->tcpc->start_drp_toggling &&
+           port->port_type == TYPEC_PORT_DRP) {
+               tcpm_log_force(port, "Start DRP toggling");
+               ret = port->tcpc->start_drp_toggling(port->tcpc, cc);
+               if (!ret)
+                       return true;
+       }
+
+       return false;
+}
+
+static void tcpm_set_cc(struct tcpm_port *port, enum typec_cc_status cc)
+{
+       tcpm_log(port, "cc:=%d", cc);
+       port->cc_req = cc;
+       port->tcpc->set_cc(port->tcpc, cc);
+}
+
+static int tcpm_init_vbus(struct tcpm_port *port)
+{
+       int ret;
+
+       ret = port->tcpc->set_vbus(port->tcpc, false, false);
+       port->vbus_source = false;
+       port->vbus_charge = false;
+       return ret;
+}
+
+static int tcpm_init_vconn(struct tcpm_port *port)
+{
+       int ret;
+
+       ret = port->tcpc->set_vconn(port->tcpc, false);
+       port->vconn_role = TYPEC_SINK;
+       return ret;
+}
+
+static void tcpm_typec_connect(struct tcpm_port *port)
+{
+       if (!port->connected) {
+               /* Make sure we don't report stale identity information */
+               memset(&port->partner_ident, 0, sizeof(port->partner_ident));
+               port->partner_desc.usb_pd = port->pd_capable;
+               if (tcpm_port_is_debug(port))
+                       port->partner_desc.accessory = TYPEC_ACCESSORY_DEBUG;
+               else if (tcpm_port_is_audio(port))
+                       port->partner_desc.accessory = TYPEC_ACCESSORY_AUDIO;
+               else
+                       port->partner_desc.accessory = TYPEC_ACCESSORY_NONE;
+               port->partner = typec_register_partner(port->typec_port,
+                                                      &port->partner_desc);
+               port->connected = true;
+       }
+}
+
+static int tcpm_src_attach(struct tcpm_port *port)
+{
+       enum typec_cc_polarity polarity =
+                               port->cc2 == TYPEC_CC_RD ? TYPEC_POLARITY_CC2
+                                                        : TYPEC_POLARITY_CC1;
+       int ret;
+
+       if (port->attached)
+               return 0;
+
+       ret = tcpm_set_polarity(port, polarity);
+       if (ret < 0)
+               return ret;
+
+       ret = tcpm_set_roles(port, true, TYPEC_SOURCE, TYPEC_HOST);
+       if (ret < 0)
+               return ret;
+
+       ret = port->tcpc->set_pd_rx(port->tcpc, true);
+       if (ret < 0)
+               goto out_disable_mux;
+
+       /*
+        * USB Type-C specification, version 1.2,
+        * chapter 4.5.2.2.8.1 (Attached.SRC Requirements)
+        * Enable VCONN only if the non-RD port is set to RA.
+        */
+       if ((polarity == TYPEC_POLARITY_CC1 && port->cc2 == TYPEC_CC_RA) ||
+           (polarity == TYPEC_POLARITY_CC2 && port->cc1 == TYPEC_CC_RA)) {
+               ret = tcpm_set_vconn(port, true);
+               if (ret < 0)
+                       goto out_disable_pd;
+       }
+
+       ret = tcpm_set_vbus(port, true);
+       if (ret < 0)
+               goto out_disable_vconn;
+
+       port->pd_capable = false;
+
+       port->partner = NULL;
+
+       port->attached = true;
+       port->send_discover = true;
+
+       return 0;
+
+out_disable_vconn:
+       tcpm_set_vconn(port, false);
+out_disable_pd:
+       port->tcpc->set_pd_rx(port->tcpc, false);
+out_disable_mux:
+       tcpm_mux_set(port, TYPEC_STATE_SAFE, USB_ROLE_NONE,
+                    TYPEC_ORIENTATION_NONE);
+       return ret;
+}
+
+static void tcpm_typec_disconnect(struct tcpm_port *port)
+{
+       if (port->connected) {
+               typec_unregister_partner(port->partner);
+               port->partner = NULL;
+               port->connected = false;
+       }
+}
+
+static void tcpm_unregister_altmodes(struct tcpm_port *port)
+{
+       struct pd_mode_data *modep = &port->mode_data;
+       int i;
+
+       for (i = 0; i < modep->altmodes; i++) {
+               typec_unregister_altmode(port->partner_altmode[i]);
+               port->partner_altmode[i] = NULL;
+       }
+
+       memset(modep, 0, sizeof(*modep));
+}
+
+static void tcpm_reset_port(struct tcpm_port *port)
+{
+       tcpm_unregister_altmodes(port);
+       tcpm_typec_disconnect(port);
+       port->attached = false;
+       port->pd_capable = false;
+       port->pps_data.supported = false;
+
+       /*
+        * First Rx ID should be 0; set this to a sentinel of -1 so that
+        * we can check tcpm_pd_rx_handler() if we had seen it before.
+        */
+       port->rx_msgid = -1;
+
+       port->tcpc->set_pd_rx(port->tcpc, false);
+       tcpm_init_vbus(port);   /* also disables charging */
+       tcpm_init_vconn(port);
+       tcpm_set_current_limit(port, 0, 0);
+       tcpm_set_polarity(port, TYPEC_POLARITY_CC1);
+       tcpm_mux_set(port, TYPEC_STATE_SAFE, USB_ROLE_NONE,
+                    TYPEC_ORIENTATION_NONE);
+       tcpm_set_attached_state(port, false);
+       port->try_src_count = 0;
+       port->try_snk_count = 0;
+       port->usb_type = POWER_SUPPLY_USB_TYPE_C;
+
+       power_supply_changed(port->psy);
+}
+
+static void tcpm_detach(struct tcpm_port *port)
+{
+       if (!port->attached)
+               return;
+
+       if (tcpm_port_is_disconnected(port))
+               port->hard_reset_count = 0;
+
+       tcpm_reset_port(port);
+}
+
+static void tcpm_src_detach(struct tcpm_port *port)
+{
+       tcpm_detach(port);
+}
+
+static int tcpm_snk_attach(struct tcpm_port *port)
+{
+       int ret;
+
+       if (port->attached)
+               return 0;
+
+       ret = tcpm_set_polarity(port, port->cc2 != TYPEC_CC_OPEN ?
+                               TYPEC_POLARITY_CC2 : TYPEC_POLARITY_CC1);
+       if (ret < 0)
+               return ret;
+
+       ret = tcpm_set_roles(port, true, TYPEC_SINK, TYPEC_DEVICE);
+       if (ret < 0)
+               return ret;
+
+       port->pd_capable = false;
+
+       port->partner = NULL;
+
+       port->attached = true;
+       port->send_discover = true;
+
+       return 0;
+}
+
+static void tcpm_snk_detach(struct tcpm_port *port)
+{
+       tcpm_detach(port);
+}
+
+static int tcpm_acc_attach(struct tcpm_port *port)
+{
+       int ret;
+
+       if (port->attached)
+               return 0;
+
+       ret = tcpm_set_roles(port, true, TYPEC_SOURCE, TYPEC_HOST);
+       if (ret < 0)
+               return ret;
+
+       port->partner = NULL;
+
+       tcpm_typec_connect(port);
+
+       port->attached = true;
+
+       return 0;
+}
+
+static void tcpm_acc_detach(struct tcpm_port *port)
+{
+       tcpm_detach(port);
+}
+
+static inline enum tcpm_state hard_reset_state(struct tcpm_port *port)
+{
+       if (port->hard_reset_count < PD_N_HARD_RESET_COUNT)
+               return HARD_RESET_SEND;
+       if (port->pd_capable)
+               return ERROR_RECOVERY;
+       if (port->pwr_role == TYPEC_SOURCE)
+               return SRC_UNATTACHED;
+       if (port->state == SNK_WAIT_CAPABILITIES)
+               return SNK_READY;
+       return SNK_UNATTACHED;
+}
+
+static inline enum tcpm_state unattached_state(struct tcpm_port *port)
+{
+       if (port->port_type == TYPEC_PORT_DRP) {
+               if (port->pwr_role == TYPEC_SOURCE)
+                       return SRC_UNATTACHED;
+               else
+                       return SNK_UNATTACHED;
+       } else if (port->port_type == TYPEC_PORT_SRC) {
+               return SRC_UNATTACHED;
+       }
+
+       return SNK_UNATTACHED;
+}
+
+static void tcpm_check_send_discover(struct tcpm_port *port)
+{
+       if (port->data_role == TYPEC_HOST && port->send_discover &&
+           port->pd_capable) {
+               tcpm_send_vdm(port, USB_SID_PD, CMD_DISCOVER_IDENT, NULL, 0);
+               port->send_discover = false;
+       }
+}
+
+static void tcpm_swap_complete(struct tcpm_port *port, int result)
+{
+       if (port->swap_pending) {
+               port->swap_status = result;
+               port->swap_pending = false;
+               port->non_pd_role_swap = false;
+               complete(&port->swap_complete);
+       }
+}
+
+static enum typec_pwr_opmode tcpm_get_pwr_opmode(enum typec_cc_status cc)
+{
+       switch (cc) {
+       case TYPEC_CC_RP_1_5:
+               return TYPEC_PWR_MODE_1_5A;
+       case TYPEC_CC_RP_3_0:
+               return TYPEC_PWR_MODE_3_0A;
+       case TYPEC_CC_RP_DEF:
+       default:
+               return TYPEC_PWR_MODE_USB;
+       }
+}
+
+static void run_state_machine(struct tcpm_port *port)
+{
+       int ret;
+       enum typec_pwr_opmode opmode;
+       unsigned int msecs;
+
+       port->enter_state = port->state;
+       switch (port->state) {
+       case DRP_TOGGLING:
+               break;
+       /* SRC states */
+       case SRC_UNATTACHED:
+               if (!port->non_pd_role_swap)
+                       tcpm_swap_complete(port, -ENOTCONN);
+               tcpm_src_detach(port);
+               if (tcpm_start_drp_toggling(port, tcpm_rp_cc(port))) {
+                       tcpm_set_state(port, DRP_TOGGLING, 0);
+                       break;
+               }
+               tcpm_set_cc(port, tcpm_rp_cc(port));
+               if (port->port_type == TYPEC_PORT_DRP)
+                       tcpm_set_state(port, SNK_UNATTACHED, PD_T_DRP_SNK);
+               break;
+       case SRC_ATTACH_WAIT:
+               if (tcpm_port_is_debug(port))
+                       tcpm_set_state(port, DEBUG_ACC_ATTACHED,
+                                      PD_T_CC_DEBOUNCE);
+               else if (tcpm_port_is_audio(port))
+                       tcpm_set_state(port, AUDIO_ACC_ATTACHED,
+                                      PD_T_CC_DEBOUNCE);
+               else if (tcpm_port_is_source(port))
+                       tcpm_set_state(port,
+                                      tcpm_try_snk(port) ? SNK_TRY
+                                                         : SRC_ATTACHED,
+                                      PD_T_CC_DEBOUNCE);
+               break;
+
+       case SNK_TRY:
+               port->try_snk_count++;
+               /*
+                * Requirements:
+                * - Do not drive vconn or vbus
+                * - Terminate CC pins (both) to Rd
+                * Action:
+                * - Wait for tDRPTry (PD_T_DRP_TRY).
+                *   Until then, ignore any state changes.
+                */
+               tcpm_set_cc(port, TYPEC_CC_RD);
+               tcpm_set_state(port, SNK_TRY_WAIT, PD_T_DRP_TRY);
+               break;
+       case SNK_TRY_WAIT:
+               if (tcpm_port_is_sink(port)) {
+                       tcpm_set_state(port, SNK_TRY_WAIT_DEBOUNCE, 0);
+               } else {
+                       tcpm_set_state(port, SRC_TRYWAIT, 0);
+                       port->max_wait = 0;
+               }
+               break;
+       case SNK_TRY_WAIT_DEBOUNCE:
+               tcpm_set_state(port, SNK_TRY_WAIT_DEBOUNCE_CHECK_VBUS,
+                              PD_T_PD_DEBOUNCE);
+               break;
+       case SNK_TRY_WAIT_DEBOUNCE_CHECK_VBUS:
+               if (port->vbus_present && tcpm_port_is_sink(port)) {
+                       tcpm_set_state(port, SNK_ATTACHED, 0);
+               } else {
+                       tcpm_set_state(port, SRC_TRYWAIT, 0);
+                       port->max_wait = 0;
+               }
+               break;
+       case SRC_TRYWAIT:
+               tcpm_set_cc(port, tcpm_rp_cc(port));
+               if (port->max_wait == 0) {
+                       port->max_wait = jiffies +
+                                        msecs_to_jiffies(PD_T_DRP_TRY);
+                       tcpm_set_state(port, SRC_TRYWAIT_UNATTACHED,
+                                      PD_T_DRP_TRY);
+               } else {
+                       if (time_is_after_jiffies(port->max_wait))
+                               tcpm_set_state(port, SRC_TRYWAIT_UNATTACHED,
+                                              jiffies_to_msecs(port->max_wait -
+                                                               jiffies));
+                       else
+                               tcpm_set_state(port, SNK_UNATTACHED, 0);
+               }
+               break;
+       case SRC_TRYWAIT_DEBOUNCE:
+               tcpm_set_state(port, SRC_ATTACHED, PD_T_CC_DEBOUNCE);
+               break;
+       case SRC_TRYWAIT_UNATTACHED:
+               tcpm_set_state(port, SNK_UNATTACHED, 0);
+               break;
+
+       case SRC_ATTACHED:
+               ret = tcpm_src_attach(port);
+               tcpm_set_state(port, SRC_UNATTACHED,
+                              ret < 0 ? 0 : PD_T_PS_SOURCE_ON);
+               break;
+       case SRC_STARTUP:
+               opmode =  tcpm_get_pwr_opmode(tcpm_rp_cc(port));
+               typec_set_pwr_opmode(port->typec_port, opmode);
+               port->pwr_opmode = TYPEC_PWR_MODE_USB;
+               port->caps_count = 0;
+               port->negotiated_rev = PD_MAX_REV;
+               port->message_id = 0;
+               port->rx_msgid = -1;
+               port->explicit_contract = false;
+               tcpm_set_state(port, SRC_SEND_CAPABILITIES, 0);
+               break;
+       case SRC_SEND_CAPABILITIES:
+               port->caps_count++;
+               if (port->caps_count > PD_N_CAPS_COUNT) {
+                       tcpm_set_state(port, SRC_READY, 0);
+                       break;
+               }
+               ret = tcpm_pd_send_source_caps(port);
+               if (ret < 0) {
+                       tcpm_set_state(port, SRC_SEND_CAPABILITIES,
+                                      PD_T_SEND_SOURCE_CAP);
+               } else {
+                       /*
+                        * Per standard, we should clear the reset counter here.
+                        * However, that can result in state machine hang-ups.
+                        * Reset it only in READY state to improve stability.
+                        */
+                       /* port->hard_reset_count = 0; */
+                       port->caps_count = 0;
+                       port->pd_capable = true;
+                       tcpm_set_state_cond(port, hard_reset_state(port),
+                                           PD_T_SEND_SOURCE_CAP);
+               }
+               break;
+       case SRC_NEGOTIATE_CAPABILITIES:
+               ret = tcpm_pd_check_request(port);
+               if (ret < 0) {
+                       tcpm_pd_send_control(port, PD_CTRL_REJECT);
+                       if (!port->explicit_contract) {
+                               tcpm_set_state(port,
+                                              SRC_WAIT_NEW_CAPABILITIES, 0);
+                       } else {
+                               tcpm_set_state(port, SRC_READY, 0);
+                       }
+               } else {
+                       tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
+                       tcpm_set_state(port, SRC_TRANSITION_SUPPLY,
+                                      PD_T_SRC_TRANSITION);
+               }
+               break;
+       case SRC_TRANSITION_SUPPLY:
+               /* XXX: regulator_set_voltage(vbus, ...) */
+               tcpm_pd_send_control(port, PD_CTRL_PS_RDY);
+               port->explicit_contract = true;
+               typec_set_pwr_opmode(port->typec_port, TYPEC_PWR_MODE_PD);
+               port->pwr_opmode = TYPEC_PWR_MODE_PD;
+               tcpm_set_state_cond(port, SRC_READY, 0);
+               break;
+       case SRC_READY:
+#if 1
+               port->hard_reset_count = 0;
+#endif
+               port->try_src_count = 0;
+
+               tcpm_swap_complete(port, 0);
+               tcpm_typec_connect(port);
+
+               tcpm_check_send_discover(port);
+               /*
+                * 6.3.5
+                * Sending ping messages is not necessary if
+                * - the source operates at vSafe5V
+                * or
+                * - The system is not operating in PD mode
+                * or
+                * - Both partners are connected using a Type-C connector
+                *
+                * There is no actual need to send PD messages since the local
+                * port type-c and the spec does not clearly say whether PD is
+                * possible when type-c is connected to Type-A/B
+                */
+               break;
+       case SRC_WAIT_NEW_CAPABILITIES:
+               /* Nothing to do... */
+               break;
+
+       /* SNK states */
+       case SNK_UNATTACHED:
+               if (!port->non_pd_role_swap)
+                       tcpm_swap_complete(port, -ENOTCONN);
+               tcpm_pps_complete(port, -ENOTCONN);
+               tcpm_snk_detach(port);
+               if (tcpm_start_drp_toggling(port, TYPEC_CC_RD)) {
+                       tcpm_set_state(port, DRP_TOGGLING, 0);
+                       break;
+               }
+               tcpm_set_cc(port, TYPEC_CC_RD);
+               if (port->port_type == TYPEC_PORT_DRP)
+                       tcpm_set_state(port, SRC_UNATTACHED, PD_T_DRP_SRC);
+               break;
+       case SNK_ATTACH_WAIT:
+               if ((port->cc1 == TYPEC_CC_OPEN &&
+                    port->cc2 != TYPEC_CC_OPEN) ||
+                   (port->cc1 != TYPEC_CC_OPEN &&
+                    port->cc2 == TYPEC_CC_OPEN))
+                       tcpm_set_state(port, SNK_DEBOUNCED,
+                                      PD_T_CC_DEBOUNCE);
+               else if (tcpm_port_is_disconnected(port))
+                       tcpm_set_state(port, SNK_UNATTACHED,
+                                      PD_T_PD_DEBOUNCE);
+               break;
+       case SNK_DEBOUNCED:
+               if (tcpm_port_is_disconnected(port))
+                       tcpm_set_state(port, SNK_UNATTACHED,
+                                      PD_T_PD_DEBOUNCE);
+               else if (port->vbus_present)
+                       tcpm_set_state(port,
+                                      tcpm_try_src(port) ? SRC_TRY
+                                                         : SNK_ATTACHED,
+                                      0);
+               else
+                       /* Wait for VBUS, but not forever */
+                       tcpm_set_state(port, PORT_RESET, PD_T_PS_SOURCE_ON);
+               break;
+
+       case SRC_TRY:
+               port->try_src_count++;
+               tcpm_set_cc(port, tcpm_rp_cc(port));
+               port->max_wait = 0;
+               tcpm_set_state(port, SRC_TRY_WAIT, 0);
+               break;
+       case SRC_TRY_WAIT:
+               if (port->max_wait == 0) {
+                       port->max_wait = jiffies +
+                                        msecs_to_jiffies(PD_T_DRP_TRY);
+                       msecs = PD_T_DRP_TRY;
+               } else {
+                       if (time_is_after_jiffies(port->max_wait))
+                               msecs = jiffies_to_msecs(port->max_wait -
+                                                        jiffies);
+                       else
+                               msecs = 0;
+               }
+               tcpm_set_state(port, SNK_TRYWAIT, msecs);
+               break;
+       case SRC_TRY_DEBOUNCE:
+               tcpm_set_state(port, SRC_ATTACHED, PD_T_PD_DEBOUNCE);
+               break;
+       case SNK_TRYWAIT:
+               tcpm_set_cc(port, TYPEC_CC_RD);
+               tcpm_set_state(port, SNK_TRYWAIT_VBUS, PD_T_CC_DEBOUNCE);
+               break;
+       case SNK_TRYWAIT_VBUS:
+               /*
+                * TCPM stays in this state indefinitely until VBUS
+                * is detected as long as Rp is not detected for
+                * more than a time period of tPDDebounce.
+                */
+               if (port->vbus_present && tcpm_port_is_sink(port)) {
+                       tcpm_set_state(port, SNK_ATTACHED, 0);
+                       break;
+               }
+               if (!tcpm_port_is_sink(port))
+                       tcpm_set_state(port, SNK_TRYWAIT_DEBOUNCE, 0);
+               break;
+       case SNK_TRYWAIT_DEBOUNCE:
+               tcpm_set_state(port, SNK_UNATTACHED, PD_T_PD_DEBOUNCE);
+               break;
+       case SNK_ATTACHED:
+               ret = tcpm_snk_attach(port);
+               if (ret < 0)
+                       tcpm_set_state(port, SNK_UNATTACHED, 0);
+               else
+                       tcpm_set_state(port, SNK_STARTUP, 0);
+               break;
+       case SNK_STARTUP:
+               opmode =  tcpm_get_pwr_opmode(port->polarity ?
+                                             port->cc2 : port->cc1);
+               typec_set_pwr_opmode(port->typec_port, opmode);
+               port->pwr_opmode = TYPEC_PWR_MODE_USB;
+               port->negotiated_rev = PD_MAX_REV;
+               port->message_id = 0;
+               port->rx_msgid = -1;
+               port->explicit_contract = false;
+               tcpm_set_state(port, SNK_DISCOVERY, 0);
+               break;
+       case SNK_DISCOVERY:
+               if (port->vbus_present) {
+                       tcpm_set_current_limit(port,
+                                              tcpm_get_current_limit(port),
+                                              5000);
+                       tcpm_set_charge(port, true);
+                       tcpm_set_state(port, SNK_WAIT_CAPABILITIES, 0);
+                       break;
+               }
+               /*
+                * For DRP, timeouts differ. Also, handling is supposed to be
+                * different and much more complex (dead battery detection;
+                * see USB power delivery specification, section 8.3.3.6.1.5.1).
+                */
+               tcpm_set_state(port, hard_reset_state(port),
+                              port->port_type == TYPEC_PORT_DRP ?
+                                       PD_T_DB_DETECT : PD_T_NO_RESPONSE);
+               break;
+       case SNK_DISCOVERY_DEBOUNCE:
+               tcpm_set_state(port, SNK_DISCOVERY_DEBOUNCE_DONE,
+                              PD_T_CC_DEBOUNCE);
+               break;
+       case SNK_DISCOVERY_DEBOUNCE_DONE:
+               if (!tcpm_port_is_disconnected(port) &&
+                   tcpm_port_is_sink(port) &&
+                   time_is_after_jiffies(port->delayed_runtime)) {
+                       tcpm_set_state(port, SNK_DISCOVERY,
+                                      jiffies_to_msecs(port->delayed_runtime -
+                                                       jiffies));
+                       break;
+               }
+               tcpm_set_state(port, unattached_state(port), 0);
+               break;
+       case SNK_WAIT_CAPABILITIES:
+               ret = port->tcpc->set_pd_rx(port->tcpc, true);
+               if (ret < 0) {
+                       tcpm_set_state(port, SNK_READY, 0);
+                       break;
+               }
+               /*
+                * If VBUS has never been low, and we time out waiting
+                * for source cap, try a soft reset first, in case we
+                * were already in a stable contract before this boot.
+                * Do this only once.
+                */
+               if (port->vbus_never_low) {
+                       port->vbus_never_low = false;
+                       tcpm_set_state(port, SOFT_RESET_SEND,
+                                      PD_T_SINK_WAIT_CAP);
+               } else {
+                       tcpm_set_state(port, hard_reset_state(port),
+                                      PD_T_SINK_WAIT_CAP);
+               }
+               break;
+       case SNK_NEGOTIATE_CAPABILITIES:
+               port->pd_capable = true;
+               port->hard_reset_count = 0;
+               ret = tcpm_pd_send_request(port);
+               if (ret < 0) {
+                       /* Let the Source send capabilities again. */
+                       tcpm_set_state(port, SNK_WAIT_CAPABILITIES, 0);
+               } else {
+                       tcpm_set_state_cond(port, hard_reset_state(port),
+                                           PD_T_SENDER_RESPONSE);
+               }
+               break;
+       case SNK_NEGOTIATE_PPS_CAPABILITIES:
+               ret = tcpm_pd_send_pps_request(port);
+               if (ret < 0) {
+                       port->pps_status = ret;
+                       /*
+                        * If this was called due to updates to sink
+                        * capabilities, and pps is no longer valid, we should
+                        * safely fall back to a standard PDO.
+                        */
+                       if (port->update_sink_caps)
+                               tcpm_set_state(port, SNK_NEGOTIATE_CAPABILITIES, 0);
+                       else
+                               tcpm_set_state(port, SNK_READY, 0);
+               } else {
+                       tcpm_set_state_cond(port, hard_reset_state(port),
+                                           PD_T_SENDER_RESPONSE);
+               }
+               break;
+       case SNK_TRANSITION_SINK:
+       case SNK_TRANSITION_SINK_VBUS:
+               tcpm_set_state(port, hard_reset_state(port),
+                              PD_T_PS_TRANSITION);
+               break;
+       case SNK_READY:
+               port->try_snk_count = 0;
+               port->update_sink_caps = false;
+               if (port->explicit_contract) {
+                       typec_set_pwr_opmode(port->typec_port,
+                                            TYPEC_PWR_MODE_PD);
+                       port->pwr_opmode = TYPEC_PWR_MODE_PD;
+               }
+
+               tcpm_swap_complete(port, 0);
+               tcpm_typec_connect(port);
+               tcpm_check_send_discover(port);
+               tcpm_pps_complete(port, port->pps_status);
+
+               power_supply_changed(port->psy);
+
+               break;
+
+       /* Accessory states */
+       case ACC_UNATTACHED:
+               tcpm_acc_detach(port);
+               tcpm_set_state(port, SRC_UNATTACHED, 0);
+               break;
+       case DEBUG_ACC_ATTACHED:
+       case AUDIO_ACC_ATTACHED:
+               ret = tcpm_acc_attach(port);
+               if (ret < 0)
+                       tcpm_set_state(port, ACC_UNATTACHED, 0);
+               break;
+       case AUDIO_ACC_DEBOUNCE:
+               tcpm_set_state(port, ACC_UNATTACHED, PD_T_CC_DEBOUNCE);
+               break;
+
+       /* Hard_Reset states */
+       case HARD_RESET_SEND:
+               tcpm_pd_transmit(port, TCPC_TX_HARD_RESET, NULL);
+               tcpm_set_state(port, HARD_RESET_START, 0);
+               break;
+       case HARD_RESET_START:
+               port->hard_reset_count++;
+               port->tcpc->set_pd_rx(port->tcpc, false);
+               tcpm_unregister_altmodes(port);
+               port->send_discover = true;
+               if (port->pwr_role == TYPEC_SOURCE)
+                       tcpm_set_state(port, SRC_HARD_RESET_VBUS_OFF,
+                                      PD_T_PS_HARD_RESET);
+               else
+                       tcpm_set_state(port, SNK_HARD_RESET_SINK_OFF, 0);
+               break;
+       case SRC_HARD_RESET_VBUS_OFF:
+               tcpm_set_vconn(port, true);
+               tcpm_set_vbus(port, false);
+               tcpm_set_roles(port, false, TYPEC_SOURCE, TYPEC_HOST);
+               tcpm_set_state(port, SRC_HARD_RESET_VBUS_ON, PD_T_SRC_RECOVER);
+               break;
+       case SRC_HARD_RESET_VBUS_ON:
+               tcpm_set_vbus(port, true);
+               port->tcpc->set_pd_rx(port->tcpc, true);
+               tcpm_set_attached_state(port, true);
+               tcpm_set_state(port, SRC_UNATTACHED, PD_T_PS_SOURCE_ON);
+               break;
+       case SNK_HARD_RESET_SINK_OFF:
+               memset(&port->pps_data, 0, sizeof(port->pps_data));
+               tcpm_set_vconn(port, false);
+               tcpm_set_charge(port, false);
+               tcpm_set_roles(port, false, TYPEC_SINK, TYPEC_DEVICE);
+               /*
+                * VBUS may or may not toggle, depending on the adapter.
+                * If it doesn't toggle, transition to SNK_HARD_RESET_SINK_ON
+                * directly after timeout.
+                */
+               tcpm_set_state(port, SNK_HARD_RESET_SINK_ON, PD_T_SAFE_0V);
+               break;
+       case SNK_HARD_RESET_WAIT_VBUS:
+               /* Assume we're disconnected if VBUS doesn't come back. */
+               tcpm_set_state(port, SNK_UNATTACHED,
+                              PD_T_SRC_RECOVER_MAX + PD_T_SRC_TURN_ON);
+               break;
+       case SNK_HARD_RESET_SINK_ON:
+               /* Note: There is no guarantee that VBUS is on in this state */
+               /*
+                * XXX:
+                * The specification suggests that dual mode ports in sink
+                * mode should transition to state PE_SRC_Transition_to_default.
+                * See USB power delivery specification chapter 8.3.3.6.1.3.
+                * This would mean to to
+                * - turn off VCONN, reset power supply
+                * - request hardware reset
+                * - turn on VCONN
+                * - Transition to state PE_Src_Startup
+                * SNK only ports shall transition to state Snk_Startup
+                * (see chapter 8.3.3.3.8).
+                * Similar, dual-mode ports in source mode should transition
+                * to PE_SNK_Transition_to_default.
+                */
+               tcpm_set_attached_state(port, true);
+               tcpm_set_state(port, SNK_STARTUP, 0);
+               break;
+
+       /* Soft_Reset states */
+       case SOFT_RESET:
+               port->message_id = 0;
+               port->rx_msgid = -1;
+               tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
+               if (port->pwr_role == TYPEC_SOURCE)
+                       tcpm_set_state(port, SRC_SEND_CAPABILITIES, 0);
+               else
+                       tcpm_set_state(port, SNK_WAIT_CAPABILITIES, 0);
+               break;
+       case SOFT_RESET_SEND:
+               port->message_id = 0;
+               port->rx_msgid = -1;
+               if (tcpm_pd_send_control(port, PD_CTRL_SOFT_RESET))
+                       tcpm_set_state_cond(port, hard_reset_state(port), 0);
+               else
+                       tcpm_set_state_cond(port, hard_reset_state(port),
+                                           PD_T_SENDER_RESPONSE);
+               break;
+
+       /* DR_Swap states */
+       case DR_SWAP_SEND:
+               tcpm_pd_send_control(port, PD_CTRL_DR_SWAP);
+               tcpm_set_state_cond(port, DR_SWAP_SEND_TIMEOUT,
+                                   PD_T_SENDER_RESPONSE);
+               break;
+       case DR_SWAP_ACCEPT:
+               tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
+               tcpm_set_state_cond(port, DR_SWAP_CHANGE_DR, 0);
+               break;
+       case DR_SWAP_SEND_TIMEOUT:
+               tcpm_swap_complete(port, -ETIMEDOUT);
+               tcpm_set_state(port, ready_state(port), 0);
+               break;
+       case DR_SWAP_CHANGE_DR:
+               if (port->data_role == TYPEC_HOST) {
+                       tcpm_unregister_altmodes(port);
+                       tcpm_set_roles(port, true, port->pwr_role,
+                                      TYPEC_DEVICE);
+               } else {
+                       tcpm_set_roles(port, true, port->pwr_role,
+                                      TYPEC_HOST);
+                       port->send_discover = true;
+               }
+               tcpm_set_state(port, ready_state(port), 0);
+               break;
+
+       /* PR_Swap states */
+       case PR_SWAP_ACCEPT:
+               tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
+               tcpm_set_state(port, PR_SWAP_START, 0);
+               break;
+       case PR_SWAP_SEND:
+               tcpm_pd_send_control(port, PD_CTRL_PR_SWAP);
+               tcpm_set_state_cond(port, PR_SWAP_SEND_TIMEOUT,
+                                   PD_T_SENDER_RESPONSE);
+               break;
+       case PR_SWAP_SEND_TIMEOUT:
+               tcpm_swap_complete(port, -ETIMEDOUT);
+               tcpm_set_state(port, ready_state(port), 0);
+               break;
+       case PR_SWAP_START:
+               if (port->pwr_role == TYPEC_SOURCE)
+                       tcpm_set_state(port, PR_SWAP_SRC_SNK_TRANSITION_OFF,
+                                      PD_T_SRC_TRANSITION);
+               else
+                       tcpm_set_state(port, PR_SWAP_SNK_SRC_SINK_OFF, 0);
+               break;
+       case PR_SWAP_SRC_SNK_TRANSITION_OFF:
+               tcpm_set_vbus(port, false);
+               port->explicit_contract = false;
+               /* allow time for Vbus discharge, must be < tSrcSwapStdby */
+               tcpm_set_state(port, PR_SWAP_SRC_SNK_SOURCE_OFF,
+                              PD_T_SRCSWAPSTDBY);
+               break;
+       case PR_SWAP_SRC_SNK_SOURCE_OFF:
+               tcpm_set_cc(port, TYPEC_CC_RD);
+               /* allow CC debounce */
+               tcpm_set_state(port, PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED,
+                              PD_T_CC_DEBOUNCE);
+               break;
+       case PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED:
+               /*
+                * USB-PD standard, 6.2.1.4, Port Power Role:
+                * "During the Power Role Swap Sequence, for the initial Source
+                * Port, the Port Power Role field shall be set to Sink in the
+                * PS_RDY Message indicating that the initial Source’s power
+                * supply is turned off"
+                */
+               tcpm_set_pwr_role(port, TYPEC_SINK);
+               if (tcpm_pd_send_control(port, PD_CTRL_PS_RDY)) {
+                       tcpm_set_state(port, ERROR_RECOVERY, 0);
+                       break;
+               }
+               tcpm_set_state_cond(port, SNK_UNATTACHED, PD_T_PS_SOURCE_ON);
+               break;
+       case PR_SWAP_SRC_SNK_SINK_ON:
+               tcpm_set_state(port, SNK_STARTUP, 0);
+               break;
+       case PR_SWAP_SNK_SRC_SINK_OFF:
+               tcpm_set_charge(port, false);
+               tcpm_set_state(port, hard_reset_state(port),
+                              PD_T_PS_SOURCE_OFF);
+               break;
+       case PR_SWAP_SNK_SRC_SOURCE_ON:
+               tcpm_set_cc(port, tcpm_rp_cc(port));
+               tcpm_set_vbus(port, true);
+               /*
+                * allow time VBUS ramp-up, must be < tNewSrc
+                * Also, this window overlaps with CC debounce as well.
+                * So, Wait for the max of two which is PD_T_NEWSRC
+                */
+               tcpm_set_state(port, PR_SWAP_SNK_SRC_SOURCE_ON_VBUS_RAMPED_UP,
+                              PD_T_NEWSRC);
+               break;
+       case PR_SWAP_SNK_SRC_SOURCE_ON_VBUS_RAMPED_UP:
+               /*
+                * USB PD standard, 6.2.1.4:
+                * "Subsequent Messages initiated by the Policy Engine,
+                * such as the PS_RDY Message sent to indicate that Vbus
+                * is ready, will have the Port Power Role field set to
+                * Source."
+                */
+               tcpm_set_pwr_role(port, TYPEC_SOURCE);
+               tcpm_pd_send_control(port, PD_CTRL_PS_RDY);
+               tcpm_set_state(port, SRC_STARTUP, 0);
+               break;
+
+       case VCONN_SWAP_ACCEPT:
+               tcpm_pd_send_control(port, PD_CTRL_ACCEPT);
+               tcpm_set_state(port, VCONN_SWAP_START, 0);
+               break;
+       case VCONN_SWAP_SEND:
+               tcpm_pd_send_control(port, PD_CTRL_VCONN_SWAP);
+               tcpm_set_state(port, VCONN_SWAP_SEND_TIMEOUT,
+                              PD_T_SENDER_RESPONSE);
+               break;
+       case VCONN_SWAP_SEND_TIMEOUT:
+               tcpm_swap_complete(port, -ETIMEDOUT);
+               tcpm_set_state(port, ready_state(port), 0);
+               break;
+       case VCONN_SWAP_START:
+               if (port->vconn_role == TYPEC_SOURCE)
+                       tcpm_set_state(port, VCONN_SWAP_WAIT_FOR_VCONN, 0);
+               else
+                       tcpm_set_state(port, VCONN_SWAP_TURN_ON_VCONN, 0);
+               break;
+       case VCONN_SWAP_WAIT_FOR_VCONN:
+               tcpm_set_state(port, hard_reset_state(port),
+                              PD_T_VCONN_SOURCE_ON);
+               break;
+       case VCONN_SWAP_TURN_ON_VCONN:
+               tcpm_set_vconn(port, true);
+               tcpm_pd_send_control(port, PD_CTRL_PS_RDY);
+               tcpm_set_state(port, ready_state(port), 0);
+               break;
+       case VCONN_SWAP_TURN_OFF_VCONN:
+               tcpm_set_vconn(port, false);
+               tcpm_set_state(port, ready_state(port), 0);
+               break;
+
+       case DR_SWAP_CANCEL:
+       case PR_SWAP_CANCEL:
+       case VCONN_SWAP_CANCEL:
+               tcpm_swap_complete(port, port->swap_status);
+               if (port->pwr_role == TYPEC_SOURCE)
+                       tcpm_set_state(port, SRC_READY, 0);
+               else
+                       tcpm_set_state(port, SNK_READY, 0);
+               break;
+
+       case BIST_RX:
+               switch (BDO_MODE_MASK(port->bist_request)) {
+               case BDO_MODE_CARRIER2:
+                       tcpm_pd_transmit(port, TCPC_TX_BIST_MODE_2, NULL);
+                       break;
+               default:
+                       break;
+               }
+               /* Always switch to unattached state */
+               tcpm_set_state(port, unattached_state(port), 0);
+               break;
+       case GET_STATUS_SEND:
+               tcpm_pd_send_control(port, PD_CTRL_GET_STATUS);
+               tcpm_set_state(port, GET_STATUS_SEND_TIMEOUT,
+                              PD_T_SENDER_RESPONSE);
+               break;
+       case GET_STATUS_SEND_TIMEOUT:
+               tcpm_set_state(port, ready_state(port), 0);
+               break;
+       case GET_PPS_STATUS_SEND:
+               tcpm_pd_send_control(port, PD_CTRL_GET_PPS_STATUS);
+               tcpm_set_state(port, GET_PPS_STATUS_SEND_TIMEOUT,
+                              PD_T_SENDER_RESPONSE);
+               break;
+       case GET_PPS_STATUS_SEND_TIMEOUT:
+               tcpm_set_state(port, ready_state(port), 0);
+               break;
+       case ERROR_RECOVERY:
+               tcpm_swap_complete(port, -EPROTO);
+               tcpm_pps_complete(port, -EPROTO);
+               tcpm_set_state(port, PORT_RESET, 0);
+               break;
+       case PORT_RESET:
+               tcpm_reset_port(port);
+               tcpm_set_cc(port, TYPEC_CC_OPEN);
+               tcpm_set_state(port, PORT_RESET_WAIT_OFF,
+                              PD_T_ERROR_RECOVERY);
+               break;
+       case PORT_RESET_WAIT_OFF:
+               tcpm_set_state(port,
+                              tcpm_default_state(port),
+                              port->vbus_present ? PD_T_PS_SOURCE_OFF : 0);
+               break;
+       default:
+               WARN(1, "Unexpected port state %d\n", port->state);
+               break;
+       }
+}
+
+static void tcpm_state_machine_work(struct work_struct *work)
+{
+       struct tcpm_port *port = container_of(work, struct tcpm_port,
+                                             state_machine.work);
+       enum tcpm_state prev_state;
+
+       mutex_lock(&port->lock);
+       port->state_machine_running = true;
+
+       if (port->queued_message && tcpm_send_queued_message(port))
+               goto done;
+
+       /* If we were queued due to a delayed state change, update it now */
+       if (port->delayed_state) {
+               tcpm_log(port, "state change %s -> %s [delayed %ld ms]",
+                        tcpm_states[port->state],
+                        tcpm_states[port->delayed_state], port->delay_ms);
+               port->prev_state = port->state;
+               port->state = port->delayed_state;
+               port->delayed_state = INVALID_STATE;
+       }
+
+       /*
+        * Continue running as long as we have (non-delayed) state changes
+        * to make.
+        */
+       do {
+               prev_state = port->state;
+               run_state_machine(port);
+               if (port->queued_message)
+                       tcpm_send_queued_message(port);
+       } while (port->state != prev_state && !port->delayed_state);
+
+done:
+       port->state_machine_running = false;
+       mutex_unlock(&port->lock);
+}
+
+static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
+                           enum typec_cc_status cc2)
+{
+       enum typec_cc_status old_cc1, old_cc2;
+       enum tcpm_state new_state;
+
+       old_cc1 = port->cc1;
+       old_cc2 = port->cc2;
+       port->cc1 = cc1;
+       port->cc2 = cc2;
+
+       tcpm_log_force(port,
+                      "CC1: %u -> %u, CC2: %u -> %u [state %s, polarity %d, %s]",
+                      old_cc1, cc1, old_cc2, cc2, tcpm_states[port->state],
+                      port->polarity,
+                      tcpm_port_is_disconnected(port) ? "disconnected"
+                                                      : "connected");
+
+       switch (port->state) {
+       case DRP_TOGGLING:
+               if (tcpm_port_is_debug(port) || tcpm_port_is_audio(port) ||
+                   tcpm_port_is_source(port))
+                       tcpm_set_state(port, SRC_ATTACH_WAIT, 0);
+               else if (tcpm_port_is_sink(port))
+                       tcpm_set_state(port, SNK_ATTACH_WAIT, 0);
+               break;
+       case SRC_UNATTACHED:
+       case ACC_UNATTACHED:
+               if (tcpm_port_is_debug(port) || tcpm_port_is_audio(port) ||
+                   tcpm_port_is_source(port))
+                       tcpm_set_state(port, SRC_ATTACH_WAIT, 0);
+               break;
+       case SRC_ATTACH_WAIT:
+               if (tcpm_port_is_disconnected(port) ||
+                   tcpm_port_is_audio_detached(port))
+                       tcpm_set_state(port, SRC_UNATTACHED, 0);
+               else if (cc1 != old_cc1 || cc2 != old_cc2)
+                       tcpm_set_state(port, SRC_ATTACH_WAIT, 0);
+               break;
+       case SRC_ATTACHED:
+       case SRC_SEND_CAPABILITIES:
+       case SRC_READY:
+               if (tcpm_port_is_disconnected(port) ||
+                   !tcpm_port_is_source(port))
+                       tcpm_set_state(port, SRC_UNATTACHED, 0);
+               break;
+       case SNK_UNATTACHED:
+               if (tcpm_port_is_sink(port))
+                       tcpm_set_state(port, SNK_ATTACH_WAIT, 0);
+               break;
+       case SNK_ATTACH_WAIT:
+               if ((port->cc1 == TYPEC_CC_OPEN &&
+                    port->cc2 != TYPEC_CC_OPEN) ||
+                   (port->cc1 != TYPEC_CC_OPEN &&
+                    port->cc2 == TYPEC_CC_OPEN))
+                       new_state = SNK_DEBOUNCED;
+               else if (tcpm_port_is_disconnected(port))
+                       new_state = SNK_UNATTACHED;
+               else
+                       break;
+               if (new_state != port->delayed_state)
+                       tcpm_set_state(port, SNK_ATTACH_WAIT, 0);
+               break;
+       case SNK_DEBOUNCED:
+               if (tcpm_port_is_disconnected(port))
+                       new_state = SNK_UNATTACHED;
+               else if (port->vbus_present)
+                       new_state = tcpm_try_src(port) ? SRC_TRY : SNK_ATTACHED;
+               else
+                       new_state = SNK_UNATTACHED;
+               if (new_state != port->delayed_state)
+                       tcpm_set_state(port, SNK_DEBOUNCED, 0);
+               break;
+       case SNK_READY:
+               if (tcpm_port_is_disconnected(port))
+                       tcpm_set_state(port, unattached_state(port), 0);
+               else if (!port->pd_capable &&
+                        (cc1 != old_cc1 || cc2 != old_cc2))
+                       tcpm_set_current_limit(port,
+                                              tcpm_get_current_limit(port),
+                                              5000);
+               break;
+
+       case AUDIO_ACC_ATTACHED:
+               if (cc1 == TYPEC_CC_OPEN || cc2 == TYPEC_CC_OPEN)
+                       tcpm_set_state(port, AUDIO_ACC_DEBOUNCE, 0);
+               break;
+       case AUDIO_ACC_DEBOUNCE:
+               if (tcpm_port_is_audio(port))
+                       tcpm_set_state(port, AUDIO_ACC_ATTACHED, 0);
+               break;
+
+       case DEBUG_ACC_ATTACHED:
+               if (cc1 == TYPEC_CC_OPEN || cc2 == TYPEC_CC_OPEN)
+                       tcpm_set_state(port, ACC_UNATTACHED, 0);
+               break;
+
+       case SNK_TRY:
+               /* Do nothing, waiting for timeout */
+               break;
+
+       case SNK_DISCOVERY:
+               /* CC line is unstable, wait for debounce */
+               if (tcpm_port_is_disconnected(port))
+                       tcpm_set_state(port, SNK_DISCOVERY_DEBOUNCE, 0);
+               break;
+       case SNK_DISCOVERY_DEBOUNCE:
+               break;
+
+       case SRC_TRYWAIT:
+               /* Hand over to state machine if needed */
+               if (!port->vbus_present && tcpm_port_is_source(port))
+                       tcpm_set_state(port, SRC_TRYWAIT_DEBOUNCE, 0);
+               break;
+       case SRC_TRYWAIT_DEBOUNCE:
+               if (port->vbus_present || !tcpm_port_is_source(port))
+                       tcpm_set_state(port, SRC_TRYWAIT, 0);
+               break;
+       case SNK_TRY_WAIT_DEBOUNCE:
+               if (!tcpm_port_is_sink(port)) {
+                       port->max_wait = 0;
+                       tcpm_set_state(port, SRC_TRYWAIT, 0);
+               }
+               break;
+       case SRC_TRY_WAIT:
+               if (tcpm_port_is_source(port))
+                       tcpm_set_state(port, SRC_TRY_DEBOUNCE, 0);
+               break;
+       case SRC_TRY_DEBOUNCE:
+               tcpm_set_state(port, SRC_TRY_WAIT, 0);
+               break;
+       case SNK_TRYWAIT_DEBOUNCE:
+               if (tcpm_port_is_sink(port))
+                       tcpm_set_state(port, SNK_TRYWAIT_VBUS, 0);
+               break;
+       case SNK_TRYWAIT_VBUS:
+               if (!tcpm_port_is_sink(port))
+                       tcpm_set_state(port, SNK_TRYWAIT_DEBOUNCE, 0);
+               break;
+       case SNK_TRYWAIT:
+               /* Do nothing, waiting for tCCDebounce */
+               break;
+       case PR_SWAP_SNK_SRC_SINK_OFF:
+       case PR_SWAP_SRC_SNK_TRANSITION_OFF:
+       case PR_SWAP_SRC_SNK_SOURCE_OFF:
+       case PR_SWAP_SRC_SNK_SOURCE_OFF_CC_DEBOUNCED:
+       case PR_SWAP_SNK_SRC_SOURCE_ON:
+               /*
+                * CC state change is expected in PR_SWAP
+                * Ignore it.
+                */
+               break;
+
+       default:
+               if (tcpm_port_is_disconnected(port))
+                       tcpm_set_state(port, unattached_state(port), 0);
+               break;
+       }
+}
+
+static void _tcpm_pd_vbus_on(struct tcpm_port *port)
+{
+       tcpm_log_force(port, "VBUS on");
+       port->vbus_present = true;
+       switch (port->state) {
+       case SNK_TRANSITION_SINK_VBUS:
+               port->explicit_contract = true;
+               tcpm_set_state(port, SNK_READY, 0);
+               break;
+       case SNK_DISCOVERY:
+               tcpm_set_state(port, SNK_DISCOVERY, 0);
+               break;
+
+       case SNK_DEBOUNCED:
+               tcpm_set_state(port, tcpm_try_src(port) ? SRC_TRY
+                                                       : SNK_ATTACHED,
+                                      0);
+               break;
+       case SNK_HARD_RESET_WAIT_VBUS:
+               tcpm_set_state(port, SNK_HARD_RESET_SINK_ON, 0);
+               break;
+       case SRC_ATTACHED:
+               tcpm_set_state(port, SRC_STARTUP, 0);
+               break;
+       case SRC_HARD_RESET_VBUS_ON:
+               tcpm_set_state(port, SRC_STARTUP, 0);
+               break;
+
+       case SNK_TRY:
+               /* Do nothing, waiting for timeout */
+               break;
+       case SRC_TRYWAIT:
+               /* Do nothing, Waiting for Rd to be detected */
+               break;
+       case SRC_TRYWAIT_DEBOUNCE:
+               tcpm_set_state(port, SRC_TRYWAIT, 0);
+               break;
+       case SNK_TRY_WAIT_DEBOUNCE:
+               /* Do nothing, waiting for PD_DEBOUNCE to do be done */
+               break;
+       case SNK_TRYWAIT:
+               /* Do nothing, waiting for tCCDebounce */
+               break;
+       case SNK_TRYWAIT_VBUS:
+               if (tcpm_port_is_sink(port))
+                       tcpm_set_state(port, SNK_ATTACHED, 0);
+               break;
+       case SNK_TRYWAIT_DEBOUNCE:
+               /* Do nothing, waiting for Rp */
+               break;
+       case SRC_TRY_WAIT:
+       case SRC_TRY_DEBOUNCE:
+               /* Do nothing, waiting for sink detection */
+               break;
+       default:
+               break;
+       }
+}
+
+static void _tcpm_pd_vbus_off(struct tcpm_port *port)
+{
+       tcpm_log_force(port, "VBUS off");
+       port->vbus_present = false;
+       port->vbus_never_low = false;
+       switch (port->state) {
+       case SNK_HARD_RESET_SINK_OFF:
+               tcpm_set_state(port, SNK_HARD_RESET_WAIT_VBUS, 0);
+               break;
+       case SRC_HARD_RESET_VBUS_OFF:
+               tcpm_set_state(port, SRC_HARD_RESET_VBUS_ON, 0);
+               break;
+       case HARD_RESET_SEND:
+               break;
+
+       case SNK_TRY:
+               /* Do nothing, waiting for timeout */
+               break;
+       case SRC_TRYWAIT:
+               /* Hand over to state machine if needed */
+               if (tcpm_port_is_source(port))
+                       tcpm_set_state(port, SRC_TRYWAIT_DEBOUNCE, 0);
+               break;
+       case SNK_TRY_WAIT_DEBOUNCE:
+               /* Do nothing, waiting for PD_DEBOUNCE to do be done */
+               break;
+       case SNK_TRYWAIT:
+       case SNK_TRYWAIT_VBUS:
+       case SNK_TRYWAIT_DEBOUNCE:
+               break;
+       case SNK_ATTACH_WAIT:
+               tcpm_set_state(port, SNK_UNATTACHED, 0);
+               break;
+
+       case SNK_NEGOTIATE_CAPABILITIES:
+               break;
+
+       case PR_SWAP_SRC_SNK_TRANSITION_OFF:
+               tcpm_set_state(port, PR_SWAP_SRC_SNK_SOURCE_OFF, 0);
+               break;
+
+       case PR_SWAP_SNK_SRC_SINK_OFF:
+               /* Do nothing, expected */
+               break;
+
+       case PORT_RESET_WAIT_OFF:
+               tcpm_set_state(port, tcpm_default_state(port), 0);
+               break;
+       case SRC_TRY_WAIT:
+       case SRC_TRY_DEBOUNCE:
+               /* Do nothing, waiting for sink detection */
+               break;
+       default:
+               if (port->pwr_role == TYPEC_SINK &&
+                   port->attached)
+                       tcpm_set_state(port, SNK_UNATTACHED, 0);
+               break;
+       }
+}
+
+static void _tcpm_pd_hard_reset(struct tcpm_port *port)
+{
+       tcpm_log_force(port, "Received hard reset");
+       /*
+        * If we keep receiving hard reset requests, executing the hard reset
+        * must have failed. Revert to error recovery if that happens.
+        */
+       tcpm_set_state(port,
+                      port->hard_reset_count < PD_N_HARD_RESET_COUNT ?
+                               HARD_RESET_START : ERROR_RECOVERY,
+                      0);
+}
+
+static void tcpm_pd_event_handler(struct work_struct *work)
+{
+       struct tcpm_port *port = container_of(work, struct tcpm_port,
+                                             event_work);
+       u32 events;
+
+       mutex_lock(&port->lock);
+
+       spin_lock(&port->pd_event_lock);
+       while (port->pd_events) {
+               events = port->pd_events;
+               port->pd_events = 0;
+               spin_unlock(&port->pd_event_lock);
+               if (events & TCPM_RESET_EVENT)
+                       _tcpm_pd_hard_reset(port);
+               if (events & TCPM_VBUS_EVENT) {
+                       bool vbus;
+
+                       vbus = port->tcpc->get_vbus(port->tcpc);
+                       if (vbus)
+                               _tcpm_pd_vbus_on(port);
+                       else
+                               _tcpm_pd_vbus_off(port);
+               }
+               if (events & TCPM_CC_EVENT) {
+                       enum typec_cc_status cc1, cc2;
+
+                       if (port->tcpc->get_cc(port->tcpc, &cc1, &cc2) == 0)
+                               _tcpm_cc_change(port, cc1, cc2);
+               }
+               spin_lock(&port->pd_event_lock);
+       }
+       spin_unlock(&port->pd_event_lock);
+       mutex_unlock(&port->lock);
+}
+
+void tcpm_cc_change(struct tcpm_port *port)
+{
+       spin_lock(&port->pd_event_lock);
+       port->pd_events |= TCPM_CC_EVENT;
+       spin_unlock(&port->pd_event_lock);
+       queue_work(port->wq, &port->event_work);
+}
+EXPORT_SYMBOL_GPL(tcpm_cc_change);
+
+void tcpm_vbus_change(struct tcpm_port *port)
+{
+       spin_lock(&port->pd_event_lock);
+       port->pd_events |= TCPM_VBUS_EVENT;
+       spin_unlock(&port->pd_event_lock);
+       queue_work(port->wq, &port->event_work);
+}
+EXPORT_SYMBOL_GPL(tcpm_vbus_change);
+
+void tcpm_pd_hard_reset(struct tcpm_port *port)
+{
+       spin_lock(&port->pd_event_lock);
+       port->pd_events = TCPM_RESET_EVENT;
+       spin_unlock(&port->pd_event_lock);
+       queue_work(port->wq, &port->event_work);
+}
+EXPORT_SYMBOL_GPL(tcpm_pd_hard_reset);
+
+static int tcpm_dr_set(const struct typec_capability *cap,
+                      enum typec_data_role data)
+{
+       struct tcpm_port *port = typec_cap_to_tcpm(cap);
+       int ret;
+
+       mutex_lock(&port->swap_lock);
+       mutex_lock(&port->lock);
+
+       if (port->port_type != TYPEC_PORT_DRP) {
+               ret = -EINVAL;
+               goto port_unlock;
+       }
+       if (port->state != SRC_READY && port->state != SNK_READY) {
+               ret = -EAGAIN;
+               goto port_unlock;
+       }
+
+       if (port->data_role == data) {
+               ret = 0;
+               goto port_unlock;
+       }
+
+       /*
+        * XXX
+        * 6.3.9: If an alternate mode is active, a request to swap
+        * alternate modes shall trigger a port reset.
+        * Reject data role swap request in this case.
+        */
+
+       if (!port->pd_capable) {
+               /*
+                * If the partner is not PD capable, reset the port to
+                * trigger a role change. This can only work if a preferred
+                * role is configured, and if it matches the requested role.
+                */
+               if (port->try_role == TYPEC_NO_PREFERRED_ROLE ||
+                   port->try_role == port->pwr_role) {
+                       ret = -EINVAL;
+                       goto port_unlock;
+               }
+               port->non_pd_role_swap = true;
+               tcpm_set_state(port, PORT_RESET, 0);
+       } else {
+               tcpm_set_state(port, DR_SWAP_SEND, 0);
+       }
+
+       port->swap_status = 0;
+       port->swap_pending = true;
+       reinit_completion(&port->swap_complete);
+       mutex_unlock(&port->lock);
+
+       if (!wait_for_completion_timeout(&port->swap_complete,
+                               msecs_to_jiffies(PD_ROLE_SWAP_TIMEOUT)))
+               ret = -ETIMEDOUT;
+       else
+               ret = port->swap_status;
+
+       port->non_pd_role_swap = false;
+       goto swap_unlock;
+
+port_unlock:
+       mutex_unlock(&port->lock);
+swap_unlock:
+       mutex_unlock(&port->swap_lock);
+       return ret;
+}
+
+static int tcpm_pr_set(const struct typec_capability *cap,
+                      enum typec_role role)
+{
+       struct tcpm_port *port = typec_cap_to_tcpm(cap);
+       int ret;
+
+       mutex_lock(&port->swap_lock);
+       mutex_lock(&port->lock);
+
+       if (port->port_type != TYPEC_PORT_DRP) {
+               ret = -EINVAL;
+               goto port_unlock;
+       }
+       if (port->state != SRC_READY && port->state != SNK_READY) {
+               ret = -EAGAIN;
+               goto port_unlock;
+       }
+
+       if (role == port->pwr_role) {
+               ret = 0;
+               goto port_unlock;
+       }
+
+       port->swap_status = 0;
+       port->swap_pending = true;
+       reinit_completion(&port->swap_complete);
+       tcpm_set_state(port, PR_SWAP_SEND, 0);
+       mutex_unlock(&port->lock);
+
+       if (!wait_for_completion_timeout(&port->swap_complete,
+                               msecs_to_jiffies(PD_ROLE_SWAP_TIMEOUT)))
+               ret = -ETIMEDOUT;
+       else
+               ret = port->swap_status;
+
+       goto swap_unlock;
+
+port_unlock:
+       mutex_unlock(&port->lock);
+swap_unlock:
+       mutex_unlock(&port->swap_lock);
+       return ret;
+}
+
+static int tcpm_vconn_set(const struct typec_capability *cap,
+                         enum typec_role role)
+{
+       struct tcpm_port *port = typec_cap_to_tcpm(cap);
+       int ret;
+
+       mutex_lock(&port->swap_lock);
+       mutex_lock(&port->lock);
+
+       if (port->state != SRC_READY && port->state != SNK_READY) {
+               ret = -EAGAIN;
+               goto port_unlock;
+       }
+
+       if (role == port->vconn_role) {
+               ret = 0;
+               goto port_unlock;
+       }
+
+       port->swap_status = 0;
+       port->swap_pending = true;
+       reinit_completion(&port->swap_complete);
+       tcpm_set_state(port, VCONN_SWAP_SEND, 0);
+       mutex_unlock(&port->lock);
+
+       if (!wait_for_completion_timeout(&port->swap_complete,
+                               msecs_to_jiffies(PD_ROLE_SWAP_TIMEOUT)))
+               ret = -ETIMEDOUT;
+       else
+               ret = port->swap_status;
+
+       goto swap_unlock;
+
+port_unlock:
+       mutex_unlock(&port->lock);
+swap_unlock:
+       mutex_unlock(&port->swap_lock);
+       return ret;
+}
+
+static int tcpm_try_role(const struct typec_capability *cap, int role)
+{
+       struct tcpm_port *port = typec_cap_to_tcpm(cap);
+       struct tcpc_dev *tcpc = port->tcpc;
+       int ret = 0;
+
+       mutex_lock(&port->lock);
+       if (tcpc->try_role)
+               ret = tcpc->try_role(tcpc, role);
+       if (!ret && !tcpc->config->try_role_hw)
+               port->try_role = role;
+       port->try_src_count = 0;
+       port->try_snk_count = 0;
+       mutex_unlock(&port->lock);
+
+       return ret;
+}
+
+static int tcpm_pps_set_op_curr(struct tcpm_port *port, u16 op_curr)
+{
+       unsigned int target_mw;
+       int ret;
+
+       mutex_lock(&port->swap_lock);
+       mutex_lock(&port->lock);
+
+       if (!port->pps_data.active) {
+               ret = -EOPNOTSUPP;
+               goto port_unlock;
+       }
+
+       if (port->state != SNK_READY) {
+               ret = -EAGAIN;
+               goto port_unlock;
+       }
+
+       if (op_curr > port->pps_data.max_curr) {
+               ret = -EINVAL;
+               goto port_unlock;
+       }
+
+       target_mw = (op_curr * port->pps_data.out_volt) / 1000;
+       if (target_mw < port->operating_snk_mw) {
+               ret = -EINVAL;
+               goto port_unlock;
+       }
+
+       reinit_completion(&port->pps_complete);
+       port->pps_data.op_curr = op_curr;
+       port->pps_status = 0;
+       port->pps_pending = true;
+       tcpm_set_state(port, SNK_NEGOTIATE_PPS_CAPABILITIES, 0);
+       mutex_unlock(&port->lock);
+
+       if (!wait_for_completion_timeout(&port->pps_complete,
+                               msecs_to_jiffies(PD_PPS_CTRL_TIMEOUT)))
+               ret = -ETIMEDOUT;
+       else
+               ret = port->pps_status;
+
+       goto swap_unlock;
+
+port_unlock:
+       mutex_unlock(&port->lock);
+swap_unlock:
+       mutex_unlock(&port->swap_lock);
+
+       return ret;
+}
+
+static int tcpm_pps_set_out_volt(struct tcpm_port *port, u16 out_volt)
+{
+       unsigned int target_mw;
+       int ret;
+
+       mutex_lock(&port->swap_lock);
+       mutex_lock(&port->lock);
+
+       if (!port->pps_data.active) {
+               ret = -EOPNOTSUPP;
+               goto port_unlock;
+       }
+
+       if (port->state != SNK_READY) {
+               ret = -EAGAIN;
+               goto port_unlock;
+       }
+
+       if (out_volt < port->pps_data.min_volt ||
+           out_volt > port->pps_data.max_volt) {
+               ret = -EINVAL;
+               goto port_unlock;
+       }
+
+       target_mw = (port->pps_data.op_curr * out_volt) / 1000;
+       if (target_mw < port->operating_snk_mw) {
+               ret = -EINVAL;
+               goto port_unlock;
+       }
+
+       reinit_completion(&port->pps_complete);
+       port->pps_data.out_volt = out_volt;
+       port->pps_status = 0;
+       port->pps_pending = true;
+       tcpm_set_state(port, SNK_NEGOTIATE_PPS_CAPABILITIES, 0);
+       mutex_unlock(&port->lock);
+
+       if (!wait_for_completion_timeout(&port->pps_complete,
+                               msecs_to_jiffies(PD_PPS_CTRL_TIMEOUT)))
+               ret = -ETIMEDOUT;
+       else
+               ret = port->pps_status;
+
+       goto swap_unlock;
+
+port_unlock:
+       mutex_unlock(&port->lock);
+swap_unlock:
+       mutex_unlock(&port->swap_lock);
+
+       return ret;
+}
+
+static int tcpm_pps_activate(struct tcpm_port *port, bool activate)
+{
+       int ret = 0;
+
+       mutex_lock(&port->swap_lock);
+       mutex_lock(&port->lock);
+
+       if (!port->pps_data.supported) {
+               ret = -EOPNOTSUPP;
+               goto port_unlock;
+       }
+
+       /* Trying to deactivate PPS when already deactivated so just bail */
+       if (!port->pps_data.active && !activate)
+               goto port_unlock;
+
+       if (port->state != SNK_READY) {
+               ret = -EAGAIN;
+               goto port_unlock;
+       }
+
+       reinit_completion(&port->pps_complete);
+       port->pps_status = 0;
+       port->pps_pending = true;
+
+       /* Trigger PPS request or move back to standard PDO contract */
+       if (activate) {
+               port->pps_data.out_volt = port->supply_voltage;
+               port->pps_data.op_curr = port->current_limit;
+               tcpm_set_state(port, SNK_NEGOTIATE_PPS_CAPABILITIES, 0);
+       } else {
+               tcpm_set_state(port, SNK_NEGOTIATE_CAPABILITIES, 0);
+       }
+       mutex_unlock(&port->lock);
+
+       if (!wait_for_completion_timeout(&port->pps_complete,
+                               msecs_to_jiffies(PD_PPS_CTRL_TIMEOUT)))
+               ret = -ETIMEDOUT;
+       else
+               ret = port->pps_status;
+
+       goto swap_unlock;
+
+port_unlock:
+       mutex_unlock(&port->lock);
+swap_unlock:
+       mutex_unlock(&port->swap_lock);
+
+       return ret;
+}
+
+static void tcpm_init(struct tcpm_port *port)
+{
+       enum typec_cc_status cc1, cc2;
+
+       port->tcpc->init(port->tcpc);
+
+       tcpm_reset_port(port);
+
+       /*
+        * XXX
+        * Should possibly wait for VBUS to settle if it was enabled locally
+        * since tcpm_reset_port() will disable VBUS.
+        */
+       port->vbus_present = port->tcpc->get_vbus(port->tcpc);
+       if (port->vbus_present)
+               port->vbus_never_low = true;
+
+       tcpm_set_state(port, tcpm_default_state(port), 0);
+
+       if (port->tcpc->get_cc(port->tcpc, &cc1, &cc2) == 0)
+               _tcpm_cc_change(port, cc1, cc2);
+
+       /*
+        * Some adapters need a clean slate at startup, and won't recover
+        * otherwise. So do not try to be fancy and force a clean disconnect.
+        */
+       tcpm_set_state(port, PORT_RESET, 0);
+}
+
+static int tcpm_port_type_set(const struct typec_capability *cap,
+                             enum typec_port_type type)
+{
+       struct tcpm_port *port = typec_cap_to_tcpm(cap);
+
+       mutex_lock(&port->lock);
+       if (type == port->port_type)
+               goto port_unlock;
+
+       port->port_type = type;
+
+       if (!port->connected) {
+               tcpm_set_state(port, PORT_RESET, 0);
+       } else if (type == TYPEC_PORT_SNK) {
+               if (!(port->pwr_role == TYPEC_SINK &&
+                     port->data_role == TYPEC_DEVICE))
+                       tcpm_set_state(port, PORT_RESET, 0);
+       } else if (type == TYPEC_PORT_SRC) {
+               if (!(port->pwr_role == TYPEC_SOURCE &&
+                     port->data_role == TYPEC_HOST))
+                       tcpm_set_state(port, PORT_RESET, 0);
+       }
+
+port_unlock:
+       mutex_unlock(&port->lock);
+       return 0;
+}
+
+void tcpm_tcpc_reset(struct tcpm_port *port)
+{
+       mutex_lock(&port->lock);
+       /* XXX: Maintain PD connection if possible? */
+       tcpm_init(port);
+       mutex_unlock(&port->lock);
+}
+EXPORT_SYMBOL_GPL(tcpm_tcpc_reset);
+
+static int tcpm_copy_pdos(u32 *dest_pdo, const u32 *src_pdo,
+                         unsigned int nr_pdo)
+{
+       unsigned int i;
+
+       if (nr_pdo > PDO_MAX_OBJECTS)
+               nr_pdo = PDO_MAX_OBJECTS;
+
+       for (i = 0; i < nr_pdo; i++)
+               dest_pdo[i] = src_pdo[i];
+
+       return nr_pdo;
+}
+
+static int tcpm_copy_vdos(u32 *dest_vdo, const u32 *src_vdo,
+                         unsigned int nr_vdo)
+{
+       unsigned int i;
+
+       if (nr_vdo > VDO_MAX_OBJECTS)
+               nr_vdo = VDO_MAX_OBJECTS;
+
+       for (i = 0; i < nr_vdo; i++)
+               dest_vdo[i] = src_vdo[i];
+
+       return nr_vdo;
+}
+
+static int tcpm_fw_get_caps(struct tcpm_port *port,
+                           struct fwnode_handle *fwnode)
+{
+       const char *cap_str;
+       int ret;
+       u32 mw;
+
+       if (!fwnode)
+               return -EINVAL;
+
+       /* USB data support is optional */
+       ret = fwnode_property_read_string(fwnode, "data-role", &cap_str);
+       if (ret == 0) {
+               port->typec_caps.data = typec_find_port_data_role(cap_str);
+               if (port->typec_caps.data < 0)
+                       return -EINVAL;
+       }
+
+       ret = fwnode_property_read_string(fwnode, "power-role", &cap_str);
+       if (ret < 0)
+               return ret;
+
+       port->typec_caps.type = typec_find_port_power_role(cap_str);
+       if (port->typec_caps.type < 0)
+               return -EINVAL;
+       port->port_type = port->typec_caps.type;
+
+       if (port->port_type == TYPEC_PORT_SNK)
+               goto sink;
+
+       /* Get source pdos */
+       ret = fwnode_property_read_u32_array(fwnode, "source-pdos",
+                                            NULL, 0);
+       if (ret <= 0)
+               return -EINVAL;
+
+       port->nr_src_pdo = min(ret, PDO_MAX_OBJECTS);
+       ret = fwnode_property_read_u32_array(fwnode, "source-pdos",
+                                            port->src_pdo, port->nr_src_pdo);
+       if ((ret < 0) || tcpm_validate_caps(port, port->src_pdo,
+                                           port->nr_src_pdo))
+               return -EINVAL;
+
+       if (port->port_type == TYPEC_PORT_SRC)
+               return 0;
+
+       /* Get the preferred power role for DRP */
+       ret = fwnode_property_read_string(fwnode, "try-power-role", &cap_str);
+       if (ret < 0)
+               return ret;
+
+       port->typec_caps.prefer_role = typec_find_power_role(cap_str);
+       if (port->typec_caps.prefer_role < 0)
+               return -EINVAL;
+sink:
+       /* Get sink pdos */
+       ret = fwnode_property_read_u32_array(fwnode, "sink-pdos",
+                                            NULL, 0);
+       if (ret <= 0)
+               return -EINVAL;
+
+       port->nr_snk_pdo = min(ret, PDO_MAX_OBJECTS);
+       ret = fwnode_property_read_u32_array(fwnode, "sink-pdos",
+                                            port->snk_pdo, port->nr_snk_pdo);
+       if ((ret < 0) || tcpm_validate_caps(port, port->snk_pdo,
+                                           port->nr_snk_pdo))
+               return -EINVAL;
+
+       if (fwnode_property_read_u32(fwnode, "op-sink-microwatt", &mw) < 0)
+               return -EINVAL;
+       port->operating_snk_mw = mw / 1000;
+
+       return 0;
+}
+
+int tcpm_update_source_capabilities(struct tcpm_port *port, const u32 *pdo,
+                                   unsigned int nr_pdo)
+{
+       if (tcpm_validate_caps(port, pdo, nr_pdo))
+               return -EINVAL;
+
+       mutex_lock(&port->lock);
+       port->nr_src_pdo = tcpm_copy_pdos(port->src_pdo, pdo, nr_pdo);
+       switch (port->state) {
+       case SRC_UNATTACHED:
+       case SRC_ATTACH_WAIT:
+       case SRC_TRYWAIT:
+               tcpm_set_cc(port, tcpm_rp_cc(port));
+               break;
+       case SRC_SEND_CAPABILITIES:
+       case SRC_NEGOTIATE_CAPABILITIES:
+       case SRC_READY:
+       case SRC_WAIT_NEW_CAPABILITIES:
+               tcpm_set_cc(port, tcpm_rp_cc(port));
+               tcpm_set_state(port, SRC_SEND_CAPABILITIES, 0);
+               break;
+       default:
+               break;
+       }
+       mutex_unlock(&port->lock);
+       return 0;
+}
+EXPORT_SYMBOL_GPL(tcpm_update_source_capabilities);
+
+int tcpm_update_sink_capabilities(struct tcpm_port *port, const u32 *pdo,
+                                 unsigned int nr_pdo,
+                                 unsigned int operating_snk_mw)
+{
+       if (tcpm_validate_caps(port, pdo, nr_pdo))
+               return -EINVAL;
+
+       mutex_lock(&port->lock);
+       port->nr_snk_pdo = tcpm_copy_pdos(port->snk_pdo, pdo, nr_pdo);
+       port->operating_snk_mw = operating_snk_mw;
+       port->update_sink_caps = true;
+
+       switch (port->state) {
+       case SNK_NEGOTIATE_CAPABILITIES:
+       case SNK_NEGOTIATE_PPS_CAPABILITIES:
+       case SNK_READY:
+       case SNK_TRANSITION_SINK:
+       case SNK_TRANSITION_SINK_VBUS:
+               if (port->pps_data.active)
+                       tcpm_set_state(port, SNK_NEGOTIATE_PPS_CAPABILITIES, 0);
+               else
+                       tcpm_set_state(port, SNK_NEGOTIATE_CAPABILITIES, 0);
+               break;
+       default:
+               break;
+       }
+       mutex_unlock(&port->lock);
+       return 0;
+}
+EXPORT_SYMBOL_GPL(tcpm_update_sink_capabilities);
+
+/* Power Supply access to expose source power information */
+enum tcpm_psy_online_states {
+       TCPM_PSY_OFFLINE = 0,
+       TCPM_PSY_FIXED_ONLINE,
+       TCPM_PSY_PROG_ONLINE,
+};
+
+static enum power_supply_property tcpm_psy_props[] = {
+       POWER_SUPPLY_PROP_USB_TYPE,
+       POWER_SUPPLY_PROP_ONLINE,
+       POWER_SUPPLY_PROP_VOLTAGE_MIN,
+       POWER_SUPPLY_PROP_VOLTAGE_MAX,
+       POWER_SUPPLY_PROP_VOLTAGE_NOW,
+       POWER_SUPPLY_PROP_CURRENT_MAX,
+       POWER_SUPPLY_PROP_CURRENT_NOW,
+};
+
+static int tcpm_psy_get_online(struct tcpm_port *port,
+                              union power_supply_propval *val)
+{
+       if (port->vbus_charge) {
+               if (port->pps_data.active)
+                       val->intval = TCPM_PSY_PROG_ONLINE;
+               else
+                       val->intval = TCPM_PSY_FIXED_ONLINE;
+       } else {
+               val->intval = TCPM_PSY_OFFLINE;
+       }
+
+       return 0;
+}
+
+static int tcpm_psy_get_voltage_min(struct tcpm_port *port,
+                                   union power_supply_propval *val)
+{
+       if (port->pps_data.active)
+               val->intval = port->pps_data.min_volt * 1000;
+       else
+               val->intval = port->supply_voltage * 1000;
+
+       return 0;
+}
+
+static int tcpm_psy_get_voltage_max(struct tcpm_port *port,
+                                   union power_supply_propval *val)
+{
+       if (port->pps_data.active)
+               val->intval = port->pps_data.max_volt * 1000;
+       else
+               val->intval = port->supply_voltage * 1000;
+
+       return 0;
+}
+
+static int tcpm_psy_get_voltage_now(struct tcpm_port *port,
+                                   union power_supply_propval *val)
+{
+       val->intval = port->supply_voltage * 1000;
+
+       return 0;
+}
+
+static int tcpm_psy_get_current_max(struct tcpm_port *port,
+                                   union power_supply_propval *val)
+{
+       if (port->pps_data.active)
+               val->intval = port->pps_data.max_curr * 1000;
+       else
+               val->intval = port->current_limit * 1000;
+
+       return 0;
+}
+
+static int tcpm_psy_get_current_now(struct tcpm_port *port,
+                                   union power_supply_propval *val)
+{
+       val->intval = port->current_limit * 1000;
+
+       return 0;
+}
+
+static int tcpm_psy_get_prop(struct power_supply *psy,
+                            enum power_supply_property psp,
+                            union power_supply_propval *val)
+{
+       struct tcpm_port *port = power_supply_get_drvdata(psy);
+       int ret = 0;
+
+       switch (psp) {
+       case POWER_SUPPLY_PROP_USB_TYPE:
+               val->intval = port->usb_type;
+               break;
+       case POWER_SUPPLY_PROP_ONLINE:
+               ret = tcpm_psy_get_online(port, val);
+               break;
+       case POWER_SUPPLY_PROP_VOLTAGE_MIN:
+               ret = tcpm_psy_get_voltage_min(port, val);
+               break;
+       case POWER_SUPPLY_PROP_VOLTAGE_MAX:
+               ret = tcpm_psy_get_voltage_max(port, val);
+               break;
+       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+               ret = tcpm_psy_get_voltage_now(port, val);
+               break;
+       case POWER_SUPPLY_PROP_CURRENT_MAX:
+               ret = tcpm_psy_get_current_max(port, val);
+               break;
+       case POWER_SUPPLY_PROP_CURRENT_NOW:
+               ret = tcpm_psy_get_current_now(port, val);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static int tcpm_psy_set_online(struct tcpm_port *port,
+                              const union power_supply_propval *val)
+{
+       int ret;
+
+       switch (val->intval) {
+       case TCPM_PSY_FIXED_ONLINE:
+               ret = tcpm_pps_activate(port, false);
+               break;
+       case TCPM_PSY_PROG_ONLINE:
+               ret = tcpm_pps_activate(port, true);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static int tcpm_psy_set_prop(struct power_supply *psy,
+                            enum power_supply_property psp,
+                            const union power_supply_propval *val)
+{
+       struct tcpm_port *port = power_supply_get_drvdata(psy);
+       int ret;
+
+       switch (psp) {
+       case POWER_SUPPLY_PROP_ONLINE:
+               ret = tcpm_psy_set_online(port, val);
+               break;
+       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+               if (val->intval < port->pps_data.min_volt * 1000 ||
+                   val->intval > port->pps_data.max_volt * 1000)
+                       ret = -EINVAL;
+               else
+                       ret = tcpm_pps_set_out_volt(port, val->intval / 1000);
+               break;
+       case POWER_SUPPLY_PROP_CURRENT_NOW:
+               if (val->intval > port->pps_data.max_curr * 1000)
+                       ret = -EINVAL;
+               else
+                       ret = tcpm_pps_set_op_curr(port, val->intval / 1000);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static int tcpm_psy_prop_writeable(struct power_supply *psy,
+                                  enum power_supply_property psp)
+{
+       switch (psp) {
+       case POWER_SUPPLY_PROP_ONLINE:
+       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+       case POWER_SUPPLY_PROP_CURRENT_NOW:
+               return 1;
+       default:
+               return 0;
+       }
+}
+
+static enum power_supply_usb_type tcpm_psy_usb_types[] = {
+       POWER_SUPPLY_USB_TYPE_C,
+       POWER_SUPPLY_USB_TYPE_PD,
+       POWER_SUPPLY_USB_TYPE_PD_PPS,
+};
+
+static const char *tcpm_psy_name_prefix = "tcpm-source-psy-";
+
+static int devm_tcpm_psy_register(struct tcpm_port *port)
+{
+       struct power_supply_config psy_cfg = {};
+       const char *port_dev_name = dev_name(port->dev);
+       size_t psy_name_len = strlen(tcpm_psy_name_prefix) +
+                                    strlen(port_dev_name) + 1;
+       char *psy_name;
+
+       psy_cfg.drv_data = port;
+       psy_cfg.fwnode = dev_fwnode(port->dev);
+       psy_name = devm_kzalloc(port->dev, psy_name_len, GFP_KERNEL);
+       if (!psy_name)
+               return -ENOMEM;
+
+       snprintf(psy_name, psy_name_len, "%s%s", tcpm_psy_name_prefix,
+                port_dev_name);
+       port->psy_desc.name = psy_name;
+       port->psy_desc.type = POWER_SUPPLY_TYPE_USB,
+       port->psy_desc.usb_types = tcpm_psy_usb_types;
+       port->psy_desc.num_usb_types = ARRAY_SIZE(tcpm_psy_usb_types);
+       port->psy_desc.properties = tcpm_psy_props,
+       port->psy_desc.num_properties = ARRAY_SIZE(tcpm_psy_props),
+       port->psy_desc.get_property = tcpm_psy_get_prop,
+       port->psy_desc.set_property = tcpm_psy_set_prop,
+       port->psy_desc.property_is_writeable = tcpm_psy_prop_writeable,
+
+       port->usb_type = POWER_SUPPLY_USB_TYPE_C;
+
+       port->psy = devm_power_supply_register(port->dev, &port->psy_desc,
+                                              &psy_cfg);
+
+       return PTR_ERR_OR_ZERO(port->psy);
+}
+
+static int tcpm_copy_caps(struct tcpm_port *port,
+                         const struct tcpc_config *tcfg)
+{
+       if (tcpm_validate_caps(port, tcfg->src_pdo, tcfg->nr_src_pdo) ||
+           tcpm_validate_caps(port, tcfg->snk_pdo, tcfg->nr_snk_pdo))
+               return -EINVAL;
+
+       port->nr_src_pdo = tcpm_copy_pdos(port->src_pdo, tcfg->src_pdo,
+                                         tcfg->nr_src_pdo);
+       port->nr_snk_pdo = tcpm_copy_pdos(port->snk_pdo, tcfg->snk_pdo,
+                                         tcfg->nr_snk_pdo);
+
+       port->nr_snk_vdo = tcpm_copy_vdos(port->snk_vdo, tcfg->snk_vdo,
+                                         tcfg->nr_snk_vdo);
+
+       port->operating_snk_mw = tcfg->operating_snk_mw;
+
+       port->typec_caps.prefer_role = tcfg->default_role;
+       port->typec_caps.type = tcfg->type;
+       port->typec_caps.data = tcfg->data;
+
+       return 0;
+}
+
+struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+{
+       struct tcpm_port *port;
+       int i, err;
+
+       if (!dev || !tcpc ||
+           !tcpc->get_vbus || !tcpc->set_cc || !tcpc->get_cc ||
+           !tcpc->set_polarity || !tcpc->set_vconn || !tcpc->set_vbus ||
+           !tcpc->set_pd_rx || !tcpc->set_roles || !tcpc->pd_transmit)
+               return ERR_PTR(-EINVAL);
+
+       port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL);
+       if (!port)
+               return ERR_PTR(-ENOMEM);
+
+       port->dev = dev;
+       port->tcpc = tcpc;
+
+       mutex_init(&port->lock);
+       mutex_init(&port->swap_lock);
+
+       port->wq = create_singlethread_workqueue(dev_name(dev));
+       if (!port->wq)
+               return ERR_PTR(-ENOMEM);
+       INIT_DELAYED_WORK(&port->state_machine, tcpm_state_machine_work);
+       INIT_DELAYED_WORK(&port->vdm_state_machine, vdm_state_machine_work);
+       INIT_WORK(&port->event_work, tcpm_pd_event_handler);
+
+       spin_lock_init(&port->pd_event_lock);
+
+       init_completion(&port->tx_complete);
+       init_completion(&port->swap_complete);
+       init_completion(&port->pps_complete);
+       tcpm_debugfs_init(port);
+
+       err = tcpm_fw_get_caps(port, tcpc->fwnode);
+       if ((err < 0) && tcpc->config)
+               err = tcpm_copy_caps(port, tcpc->config);
+       if (err < 0)
+               goto out_destroy_wq;
+
+       if (!tcpc->config || !tcpc->config->try_role_hw)
+               port->try_role = port->typec_caps.prefer_role;
+       else
+               port->try_role = TYPEC_NO_PREFERRED_ROLE;
+
+       port->typec_caps.fwnode = tcpc->fwnode;
+       port->typec_caps.revision = 0x0120;     /* Type-C spec release 1.2 */
+       port->typec_caps.pd_revision = 0x0300;  /* USB-PD spec release 3.0 */
+       port->typec_caps.dr_set = tcpm_dr_set;
+       port->typec_caps.pr_set = tcpm_pr_set;
+       port->typec_caps.vconn_set = tcpm_vconn_set;
+       port->typec_caps.try_role = tcpm_try_role;
+       port->typec_caps.port_type_set = tcpm_port_type_set;
+
+       port->partner_desc.identity = &port->partner_ident;
+       port->port_type = port->typec_caps.type;
+
+       port->role_sw = usb_role_switch_get(port->dev);
+       if (IS_ERR(port->role_sw)) {
+               err = PTR_ERR(port->role_sw);
+               goto out_destroy_wq;
+       }
+
+       err = devm_tcpm_psy_register(port);
+       if (err)
+               goto out_destroy_wq;
+
+       port->typec_port = typec_register_port(port->dev, &port->typec_caps);
+       if (IS_ERR(port->typec_port)) {
+               err = PTR_ERR(port->typec_port);
+               goto out_destroy_wq;
+       }
+
+       if (tcpc->config && tcpc->config->alt_modes) {
+               const struct typec_altmode_desc *paltmode = tcpc->config->alt_modes;
+
+               i = 0;
+               while (paltmode->svid && i < ARRAY_SIZE(port->port_altmode)) {
+                       struct typec_altmode *alt;
+
+                       alt = typec_port_register_altmode(port->typec_port,
+                                                         paltmode);
+                       if (IS_ERR(alt)) {
+                               tcpm_log(port,
+                                        "%s: failed to register port alternate mode 0x%x",
+                                        dev_name(dev), paltmode->svid);
+                               break;
+                       }
+                       typec_altmode_set_drvdata(alt, port);
+                       alt->ops = &tcpm_altmode_ops;
+                       port->port_altmode[i] = alt;
+                       i++;
+                       paltmode++;
+               }
+       }
+
+       mutex_lock(&port->lock);
+       tcpm_init(port);
+       mutex_unlock(&port->lock);
+
+       tcpm_log(port, "%s: registered", dev_name(dev));
+       return port;
+
+out_destroy_wq:
+       usb_role_switch_put(port->role_sw);
+       destroy_workqueue(port->wq);
+       return ERR_PTR(err);
+}
+EXPORT_SYMBOL_GPL(tcpm_register_port);
+
+void tcpm_unregister_port(struct tcpm_port *port)
+{
+       int i;
+
+       tcpm_reset_port(port);
+       for (i = 0; i < ARRAY_SIZE(port->port_altmode); i++)
+               typec_unregister_altmode(port->port_altmode[i]);
+       typec_unregister_port(port->typec_port);
+       usb_role_switch_put(port->role_sw);
+       tcpm_debugfs_exit(port);
+       destroy_workqueue(port->wq);
+}
+EXPORT_SYMBOL_GPL(tcpm_unregister_port);
+
+MODULE_AUTHOR("Guenter Roeck <groeck@chromium.org>");
+MODULE_DESCRIPTION("USB Type-C Port Manager");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/typec/tcpm/wcove.c b/drivers/usb/typec/tcpm/wcove.c
new file mode 100644 (file)
index 0000000..423208e
--- /dev/null
@@ -0,0 +1,693 @@
+// SPDX-License-Identifier: GPL-2.0
+/**
+ * typec_wcove.c - WhiskeyCove PMIC USB Type-C PHY driver
+ *
+ * Copyright (C) 2017 Intel Corporation
+ * Author: Heikki Krogerus <heikki.krogerus@linux.intel.com>
+ */
+
+#include <linux/acpi.h>
+#include <linux/module.h>
+#include <linux/usb/tcpm.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/intel_soc_pmic.h>
+
+/* Register offsets */
+#define WCOVE_CHGRIRQ0         0x4e09
+
+#define USBC_CONTROL1          0x7001
+#define USBC_CONTROL2          0x7002
+#define USBC_CONTROL3          0x7003
+#define USBC_CC1_CTRL          0x7004
+#define USBC_CC2_CTRL          0x7005
+#define USBC_STATUS1           0x7007
+#define USBC_STATUS2           0x7008
+#define USBC_STATUS3           0x7009
+#define USBC_CC1               0x700a
+#define USBC_CC2               0x700b
+#define USBC_CC1_STATUS                0x700c
+#define USBC_CC2_STATUS                0x700d
+#define USBC_IRQ1              0x7015
+#define USBC_IRQ2              0x7016
+#define USBC_IRQMASK1          0x7017
+#define USBC_IRQMASK2          0x7018
+#define USBC_PDCFG2            0x701a
+#define USBC_PDCFG3            0x701b
+#define USBC_PDSTATUS          0x701c
+#define USBC_RXSTATUS          0x701d
+#define USBC_RXINFO            0x701e
+#define USBC_TXCMD             0x701f
+#define USBC_TXINFO            0x7020
+#define USBC_RX_DATA           0x7028
+#define USBC_TX_DATA           0x7047
+
+/* Register bits */
+
+#define USBC_CONTROL1_MODE_MASK                0x3
+#define   USBC_CONTROL1_MODE_SNK       0
+#define   USBC_CONTROL1_MODE_SNKACC    1
+#define   USBC_CONTROL1_MODE_SRC       2
+#define   USBC_CONTROL1_MODE_SRCACC    3
+#define   USBC_CONTROL1_MODE_DRP       4
+#define   USBC_CONTROL1_MODE_DRPACC    5
+#define   USBC_CONTROL1_MODE_TEST      7
+#define USBC_CONTROL1_CURSRC_MASK      0xc
+#define   USBC_CONTROL1_CURSRC_UA_0    (0 << 3)
+#define   USBC_CONTROL1_CURSRC_UA_80   (1 << 3)
+#define   USBC_CONTROL1_CURSRC_UA_180  (2 << 3)
+#define   USBC_CONTROL1_CURSRC_UA_330  (3 << 3)
+#define USBC_CONTROL1_DRPTOGGLE_RANDOM 0xe0
+
+#define USBC_CONTROL2_UNATT_SNK                BIT(0)
+#define USBC_CONTROL2_UNATT_SRC                BIT(1)
+#define USBC_CONTROL2_DIS_ST           BIT(2)
+
+#define USBC_CONTROL3_DET_DIS          BIT(0)
+#define USBC_CONTROL3_PD_DIS           BIT(1)
+#define USBC_CONTROL3_RESETPHY         BIT(2)
+
+#define USBC_CC_CTRL_PU_EN             BIT(0)
+#define USBC_CC_CTRL_VCONN_EN          BIT(1)
+#define USBC_CC_CTRL_TX_EN             BIT(2)
+#define USBC_CC_CTRL_PD_EN             BIT(3)
+#define USBC_CC_CTRL_CDET_EN           BIT(4)
+#define USBC_CC_CTRL_RDET_EN           BIT(5)
+#define USBC_CC_CTRL_ADC_EN            BIT(6)
+#define USBC_CC_CTRL_VBUSOK            BIT(7)
+
+#define USBC_STATUS1_DET_ONGOING       BIT(6)
+#define USBC_STATUS1_RSLT(r)           ((r) & 0xf)
+#define USBC_RSLT_NOTHING              0
+#define USBC_RSLT_SRC_DEFAULT          1
+#define USBC_RSLT_SRC_1_5A             2
+#define USBC_RSLT_SRC_3_0A             3
+#define USBC_RSLT_SNK                  4
+#define USBC_RSLT_DEBUG_ACC            5
+#define USBC_RSLT_AUDIO_ACC            6
+#define USBC_RSLT_UNDEF                        15
+#define USBC_STATUS1_ORIENT(r)         (((r) >> 4) & 0x3)
+#define USBC_ORIENT_NORMAL             1
+#define USBC_ORIENT_REVERSE            2
+
+#define USBC_STATUS2_VBUS_REQ          BIT(5)
+
+#define UCSC_CC_STATUS_SNK_RP          BIT(0)
+#define UCSC_CC_STATUS_PWRDEFSNK       BIT(1)
+#define UCSC_CC_STATUS_PWR_1P5A_SNK    BIT(2)
+#define UCSC_CC_STATUS_PWR_3A_SNK      BIT(3)
+#define UCSC_CC_STATUS_SRC_RP          BIT(4)
+#define UCSC_CC_STATUS_RX(r)           (((r) >> 5) & 0x3)
+#define   USBC_CC_STATUS_RD            1
+#define   USBC_CC_STATUS_RA            2
+
+#define USBC_IRQ1_ADCDONE1             BIT(2)
+#define USBC_IRQ1_OVERTEMP             BIT(1)
+#define USBC_IRQ1_SHORT                        BIT(0)
+
+#define USBC_IRQ2_CC_CHANGE            BIT(7)
+#define USBC_IRQ2_RX_PD                        BIT(6)
+#define USBC_IRQ2_RX_HR                        BIT(5)
+#define USBC_IRQ2_RX_CR                        BIT(4)
+#define USBC_IRQ2_TX_SUCCESS           BIT(3)
+#define USBC_IRQ2_TX_FAIL              BIT(2)
+
+#define USBC_IRQMASK1_ALL      (USBC_IRQ1_ADCDONE1 | USBC_IRQ1_OVERTEMP | \
+                                USBC_IRQ1_SHORT)
+
+#define USBC_IRQMASK2_ALL      (USBC_IRQ2_CC_CHANGE | USBC_IRQ2_RX_PD | \
+                                USBC_IRQ2_RX_HR | USBC_IRQ2_RX_CR | \
+                                USBC_IRQ2_TX_SUCCESS | USBC_IRQ2_TX_FAIL)
+
+#define USBC_PDCFG2_SOP                        BIT(0)
+#define USBC_PDCFG2_SOP_P              BIT(1)
+#define USBC_PDCFG2_SOP_PP             BIT(2)
+#define USBC_PDCFG2_SOP_P_DEBUG                BIT(3)
+#define USBC_PDCFG2_SOP_PP_DEBUG       BIT(4)
+
+#define USBC_PDCFG3_DATAROLE_SHIFT     1
+#define USBC_PDCFG3_SOP_SHIFT          2
+
+#define USBC_RXSTATUS_RXCLEAR          BIT(0)
+#define USBC_RXSTATUS_RXDATA           BIT(7)
+
+#define USBC_RXINFO_RXBYTES(i)         (((i) >> 3) & 0x1f)
+
+#define USBC_TXCMD_BUF_RDY             BIT(0)
+#define USBC_TXCMD_START               BIT(1)
+#define USBC_TXCMD_NOP                 (0 << 5)
+#define USBC_TXCMD_MSG                 (1 << 5)
+#define USBC_TXCMD_CR                  (2 << 5)
+#define USBC_TXCMD_HR                  (3 << 5)
+#define USBC_TXCMD_BIST                        (4 << 5)
+
+#define USBC_TXINFO_RETRIES(d)         (d << 3)
+
+struct wcove_typec {
+       struct mutex lock; /* device lock */
+       struct device *dev;
+       struct regmap *regmap;
+       guid_t guid;
+
+       bool vbus;
+
+       struct tcpc_dev tcpc;
+       struct tcpm_port *tcpm;
+};
+
+#define tcpc_to_wcove(_tcpc_) container_of(_tcpc_, struct wcove_typec, tcpc)
+
+enum wcove_typec_func {
+       WCOVE_FUNC_DRIVE_VBUS = 1,
+       WCOVE_FUNC_ORIENTATION,
+       WCOVE_FUNC_ROLE,
+       WCOVE_FUNC_DRIVE_VCONN,
+};
+
+enum wcove_typec_orientation {
+       WCOVE_ORIENTATION_NORMAL,
+       WCOVE_ORIENTATION_REVERSE,
+};
+
+enum wcove_typec_role {
+       WCOVE_ROLE_HOST,
+       WCOVE_ROLE_DEVICE,
+};
+
+#define WCOVE_DSM_UUID         "482383f0-2876-4e49-8685-db66211af037"
+
+static int wcove_typec_func(struct wcove_typec *wcove,
+                           enum wcove_typec_func func, int param)
+{
+       union acpi_object *obj;
+       union acpi_object tmp;
+       union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(1, &tmp);
+
+       tmp.type = ACPI_TYPE_INTEGER;
+       tmp.integer.value = param;
+
+       obj = acpi_evaluate_dsm(ACPI_HANDLE(wcove->dev), &wcove->guid, 1, func,
+                               &argv4);
+       if (!obj) {
+               dev_err(wcove->dev, "%s: failed to evaluate _DSM\n", __func__);
+               return -EIO;
+       }
+
+       ACPI_FREE(obj);
+       return 0;
+}
+
+static int wcove_init(struct tcpc_dev *tcpc)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+       int ret;
+
+       ret = regmap_write(wcove->regmap, USBC_CONTROL1, 0);
+       if (ret)
+               return ret;
+
+       /* Unmask everything */
+       ret = regmap_write(wcove->regmap, USBC_IRQMASK1, 0);
+       if (ret)
+               return ret;
+
+       return regmap_write(wcove->regmap, USBC_IRQMASK2, 0);
+}
+
+static int wcove_get_vbus(struct tcpc_dev *tcpc)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+       unsigned int cc1ctrl;
+       int ret;
+
+       ret = regmap_read(wcove->regmap, USBC_CC1_CTRL, &cc1ctrl);
+       if (ret)
+               return ret;
+
+       wcove->vbus = !!(cc1ctrl & USBC_CC_CTRL_VBUSOK);
+
+       return wcove->vbus;
+}
+
+static int wcove_set_vbus(struct tcpc_dev *tcpc, bool on, bool sink)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+
+       return wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VBUS, on);
+}
+
+static int wcove_set_vconn(struct tcpc_dev *tcpc, bool on)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+
+       return wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, on);
+}
+
+static enum typec_cc_status wcove_to_typec_cc(unsigned int cc)
+{
+       if (cc & UCSC_CC_STATUS_SNK_RP) {
+               if (cc & UCSC_CC_STATUS_PWRDEFSNK)
+                       return TYPEC_CC_RP_DEF;
+               else if (cc & UCSC_CC_STATUS_PWR_1P5A_SNK)
+                       return TYPEC_CC_RP_1_5;
+               else if (cc & UCSC_CC_STATUS_PWR_3A_SNK)
+                       return TYPEC_CC_RP_3_0;
+       } else {
+               switch (UCSC_CC_STATUS_RX(cc)) {
+               case USBC_CC_STATUS_RD:
+                       return TYPEC_CC_RD;
+               case USBC_CC_STATUS_RA:
+                       return TYPEC_CC_RA;
+               default:
+                       break;
+               }
+       }
+       return TYPEC_CC_OPEN;
+}
+
+static int wcove_get_cc(struct tcpc_dev *tcpc, enum typec_cc_status *cc1,
+                       enum typec_cc_status *cc2)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+       unsigned int cc1_status;
+       unsigned int cc2_status;
+       int ret;
+
+       ret = regmap_read(wcove->regmap, USBC_CC1_STATUS, &cc1_status);
+       if (ret)
+               return ret;
+
+       ret = regmap_read(wcove->regmap, USBC_CC2_STATUS, &cc2_status);
+       if (ret)
+               return ret;
+
+       *cc1 = wcove_to_typec_cc(cc1_status);
+       *cc2 = wcove_to_typec_cc(cc2_status);
+
+       return 0;
+}
+
+static int wcove_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+       unsigned int ctrl;
+
+       switch (cc) {
+       case TYPEC_CC_RD:
+               ctrl = USBC_CONTROL1_MODE_SNK;
+               break;
+       case TYPEC_CC_RP_DEF:
+               ctrl = USBC_CONTROL1_CURSRC_UA_80 | USBC_CONTROL1_MODE_SRC;
+               break;
+       case TYPEC_CC_RP_1_5:
+               ctrl = USBC_CONTROL1_CURSRC_UA_180 | USBC_CONTROL1_MODE_SRC;
+               break;
+       case TYPEC_CC_RP_3_0:
+               ctrl = USBC_CONTROL1_CURSRC_UA_330 | USBC_CONTROL1_MODE_SRC;
+               break;
+       case TYPEC_CC_OPEN:
+               ctrl = 0;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return regmap_write(wcove->regmap, USBC_CONTROL1, ctrl);
+}
+
+static int wcove_set_polarity(struct tcpc_dev *tcpc, enum typec_cc_polarity pol)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+
+       return wcove_typec_func(wcove, WCOVE_FUNC_ORIENTATION, pol);
+}
+
+static int wcove_set_current_limit(struct tcpc_dev *tcpc, u32 max_ma, u32 mv)
+{
+       return 0;
+}
+
+static int wcove_set_roles(struct tcpc_dev *tcpc, bool attached,
+                          enum typec_role role, enum typec_data_role data)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+       unsigned int val;
+       int ret;
+
+       ret = wcove_typec_func(wcove, WCOVE_FUNC_ROLE, data == TYPEC_HOST ?
+                              WCOVE_ROLE_HOST : WCOVE_ROLE_DEVICE);
+       if (ret)
+               return ret;
+
+       val = role;
+       val |= data << USBC_PDCFG3_DATAROLE_SHIFT;
+       val |= PD_REV20 << USBC_PDCFG3_SOP_SHIFT;
+
+       return regmap_write(wcove->regmap, USBC_PDCFG3, val);
+}
+
+static int wcove_set_pd_rx(struct tcpc_dev *tcpc, bool on)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+
+       return regmap_write(wcove->regmap, USBC_PDCFG2,
+                           on ? USBC_PDCFG2_SOP : 0);
+}
+
+static int wcove_pd_transmit(struct tcpc_dev *tcpc,
+                            enum tcpm_transmit_type type,
+                            const struct pd_message *msg)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+       unsigned int info = 0;
+       unsigned int cmd;
+       int ret;
+
+       ret = regmap_read(wcove->regmap, USBC_TXCMD, &cmd);
+       if (ret)
+               return ret;
+
+       if (!(cmd & USBC_TXCMD_BUF_RDY)) {
+               dev_warn(wcove->dev, "%s: Last transmission still ongoing!",
+                        __func__);
+               return -EBUSY;
+       }
+
+       if (msg) {
+               const u8 *data = (void *)msg;
+               int i;
+
+               for (i = 0; i < pd_header_cnt(msg->header) * 4 + 2; i++) {
+                       ret = regmap_write(wcove->regmap, USBC_TX_DATA + i,
+                                          data[i]);
+                       if (ret)
+                               return ret;
+               }
+       }
+
+       switch (type) {
+       case TCPC_TX_SOP:
+       case TCPC_TX_SOP_PRIME:
+       case TCPC_TX_SOP_PRIME_PRIME:
+       case TCPC_TX_SOP_DEBUG_PRIME:
+       case TCPC_TX_SOP_DEBUG_PRIME_PRIME:
+               info = type + 1;
+               cmd = USBC_TXCMD_MSG;
+               break;
+       case TCPC_TX_HARD_RESET:
+               cmd = USBC_TXCMD_HR;
+               break;
+       case TCPC_TX_CABLE_RESET:
+               cmd = USBC_TXCMD_CR;
+               break;
+       case TCPC_TX_BIST_MODE_2:
+               cmd = USBC_TXCMD_BIST;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       /* NOTE Setting maximum number of retries (7) */
+       ret = regmap_write(wcove->regmap, USBC_TXINFO,
+                          info | USBC_TXINFO_RETRIES(7));
+       if (ret)
+               return ret;
+
+       return regmap_write(wcove->regmap, USBC_TXCMD, cmd | USBC_TXCMD_START);
+}
+
+static int wcove_start_drp_toggling(struct tcpc_dev *tcpc,
+                                   enum typec_cc_status cc)
+{
+       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+       unsigned int usbc_ctrl;
+
+       usbc_ctrl = USBC_CONTROL1_MODE_DRP | USBC_CONTROL1_DRPTOGGLE_RANDOM;
+
+       switch (cc) {
+       case TYPEC_CC_RP_1_5:
+               usbc_ctrl |= USBC_CONTROL1_CURSRC_UA_180;
+               break;
+       case TYPEC_CC_RP_3_0:
+               usbc_ctrl |= USBC_CONTROL1_CURSRC_UA_330;
+               break;
+       default:
+               usbc_ctrl |= USBC_CONTROL1_CURSRC_UA_80;
+               break;
+       }
+
+       return regmap_write(wcove->regmap, USBC_CONTROL1, usbc_ctrl);
+}
+
+static int wcove_read_rx_buffer(struct wcove_typec *wcove, void *msg)
+{
+       unsigned int info;
+       int ret;
+       int i;
+
+       ret = regmap_read(wcove->regmap, USBC_RXINFO, &info);
+       if (ret)
+               return ret;
+
+       /* FIXME: Check that USBC_RXINFO_RXBYTES(info) matches the header */
+
+       for (i = 0; i < USBC_RXINFO_RXBYTES(info); i++) {
+               ret = regmap_read(wcove->regmap, USBC_RX_DATA + i, msg + i);
+               if (ret)
+                       return ret;
+       }
+
+       return regmap_write(wcove->regmap, USBC_RXSTATUS,
+                           USBC_RXSTATUS_RXCLEAR);
+}
+
+static irqreturn_t wcove_typec_irq(int irq, void *data)
+{
+       struct wcove_typec *wcove = data;
+       unsigned int usbc_irq1 = 0;
+       unsigned int usbc_irq2 = 0;
+       unsigned int cc1ctrl;
+       int ret;
+
+       mutex_lock(&wcove->lock);
+
+       /* Read.. */
+       ret = regmap_read(wcove->regmap, USBC_IRQ1, &usbc_irq1);
+       if (ret)
+               goto err;
+
+       ret = regmap_read(wcove->regmap, USBC_IRQ2, &usbc_irq2);
+       if (ret)
+               goto err;
+
+       ret = regmap_read(wcove->regmap, USBC_CC1_CTRL, &cc1ctrl);
+       if (ret)
+               goto err;
+
+       if (!wcove->tcpm)
+               goto err;
+
+       /* ..check.. */
+       if (usbc_irq1 & USBC_IRQ1_OVERTEMP) {
+               dev_err(wcove->dev, "VCONN Switch Over Temperature!\n");
+               wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, false);
+               /* REVISIT: Report an error? */
+       }
+
+       if (usbc_irq1 & USBC_IRQ1_SHORT) {
+               dev_err(wcove->dev, "VCONN Switch Short Circuit!\n");
+               wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, false);
+               /* REVISIT: Report an error? */
+       }
+
+       if (wcove->vbus != !!(cc1ctrl & USBC_CC_CTRL_VBUSOK))
+               tcpm_vbus_change(wcove->tcpm);
+
+       /* REVISIT: See if tcpm code can be made to consider Type-C HW FSMs */
+       if (usbc_irq2 & USBC_IRQ2_CC_CHANGE)
+               tcpm_cc_change(wcove->tcpm);
+
+       if (usbc_irq2 & USBC_IRQ2_RX_PD) {
+               unsigned int status;
+
+               /*
+                * FIXME: Need to check if TX is ongoing and report
+                * TX_DIREGARDED if needed?
+                */
+
+               ret = regmap_read(wcove->regmap, USBC_RXSTATUS, &status);
+               if (ret)
+                       goto err;
+
+               /* Flush all buffers */
+               while (status & USBC_RXSTATUS_RXDATA) {
+                       struct pd_message msg;
+
+                       ret = wcove_read_rx_buffer(wcove, &msg);
+                       if (ret) {
+                               dev_err(wcove->dev, "%s: RX read failed\n",
+                                       __func__);
+                               goto err;
+                       }
+
+                       tcpm_pd_receive(wcove->tcpm, &msg);
+
+                       ret = regmap_read(wcove->regmap, USBC_RXSTATUS,
+                                         &status);
+                       if (ret)
+                               goto err;
+               }
+       }
+
+       if (usbc_irq2 & USBC_IRQ2_RX_HR)
+               tcpm_pd_hard_reset(wcove->tcpm);
+
+       /* REVISIT: if (usbc_irq2 & USBC_IRQ2_RX_CR) */
+
+       if (usbc_irq2 & USBC_IRQ2_TX_SUCCESS)
+               tcpm_pd_transmit_complete(wcove->tcpm, TCPC_TX_SUCCESS);
+
+       if (usbc_irq2 & USBC_IRQ2_TX_FAIL)
+               tcpm_pd_transmit_complete(wcove->tcpm, TCPC_TX_FAILED);
+
+err:
+       /* ..and clear. */
+       if (usbc_irq1) {
+               ret = regmap_write(wcove->regmap, USBC_IRQ1, usbc_irq1);
+               if (ret)
+                       dev_WARN(wcove->dev, "%s failed to clear IRQ1\n",
+                                __func__);
+       }
+
+       if (usbc_irq2) {
+               ret = regmap_write(wcove->regmap, USBC_IRQ2, usbc_irq2);
+               if (ret)
+                       dev_WARN(wcove->dev, "%s failed to clear IRQ2\n",
+                                __func__);
+       }
+
+       /* REVISIT: Clear WhiskeyCove CHGR Type-C interrupt */
+       regmap_write(wcove->regmap, WCOVE_CHGRIRQ0, BIT(5));
+
+       mutex_unlock(&wcove->lock);
+       return IRQ_HANDLED;
+}
+
+/*
+ * The following power levels should be safe to use with Joule board.
+ */
+static const u32 src_pdo[] = {
+       PDO_FIXED(5000, 1500, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |
+                 PDO_FIXED_USB_COMM),
+};
+
+static const u32 snk_pdo[] = {
+       PDO_FIXED(5000, 500, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |
+                 PDO_FIXED_USB_COMM),
+       PDO_VAR(5000, 12000, 3000),
+};
+
+static struct tcpc_config wcove_typec_config = {
+       .src_pdo = src_pdo,
+       .nr_src_pdo = ARRAY_SIZE(src_pdo),
+       .snk_pdo = snk_pdo,
+       .nr_snk_pdo = ARRAY_SIZE(snk_pdo),
+
+       .operating_snk_mw = 15000,
+
+       .type = TYPEC_PORT_DRP,
+       .data = TYPEC_PORT_DRD,
+       .default_role = TYPEC_SINK,
+};
+
+static int wcove_typec_probe(struct platform_device *pdev)
+{
+       struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent);
+       struct wcove_typec *wcove;
+       int irq;
+       int ret;
+
+       wcove = devm_kzalloc(&pdev->dev, sizeof(*wcove), GFP_KERNEL);
+       if (!wcove)
+               return -ENOMEM;
+
+       mutex_init(&wcove->lock);
+       wcove->dev = &pdev->dev;
+       wcove->regmap = pmic->regmap;
+
+       irq = regmap_irq_get_virq(pmic->irq_chip_data_chgr,
+                                 platform_get_irq(pdev, 0));
+       if (irq < 0)
+               return irq;
+
+       ret = guid_parse(WCOVE_DSM_UUID, &wcove->guid);
+       if (ret)
+               return ret;
+
+       if (!acpi_check_dsm(ACPI_HANDLE(&pdev->dev), &wcove->guid, 0, 0x1f)) {
+               dev_err(&pdev->dev, "Missing _DSM functions\n");
+               return -ENODEV;
+       }
+
+       wcove->tcpc.init = wcove_init;
+       wcove->tcpc.get_vbus = wcove_get_vbus;
+       wcove->tcpc.set_vbus = wcove_set_vbus;
+       wcove->tcpc.set_cc = wcove_set_cc;
+       wcove->tcpc.get_cc = wcove_get_cc;
+       wcove->tcpc.set_polarity = wcove_set_polarity;
+       wcove->tcpc.set_vconn = wcove_set_vconn;
+       wcove->tcpc.set_current_limit = wcove_set_current_limit;
+       wcove->tcpc.start_drp_toggling = wcove_start_drp_toggling;
+
+       wcove->tcpc.set_pd_rx = wcove_set_pd_rx;
+       wcove->tcpc.set_roles = wcove_set_roles;
+       wcove->tcpc.pd_transmit = wcove_pd_transmit;
+
+       wcove->tcpc.config = &wcove_typec_config;
+
+       wcove->tcpm = tcpm_register_port(wcove->dev, &wcove->tcpc);
+       if (IS_ERR(wcove->tcpm))
+               return PTR_ERR(wcove->tcpm);
+
+       ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                       wcove_typec_irq, IRQF_ONESHOT,
+                                       "wcove_typec", wcove);
+       if (ret) {
+               tcpm_unregister_port(wcove->tcpm);
+               return ret;
+       }
+
+       platform_set_drvdata(pdev, wcove);
+       return 0;
+}
+
+static int wcove_typec_remove(struct platform_device *pdev)
+{
+       struct wcove_typec *wcove = platform_get_drvdata(pdev);
+       unsigned int val;
+
+       /* Mask everything */
+       regmap_read(wcove->regmap, USBC_IRQMASK1, &val);
+       regmap_write(wcove->regmap, USBC_IRQMASK1, val | USBC_IRQMASK1_ALL);
+       regmap_read(wcove->regmap, USBC_IRQMASK2, &val);
+       regmap_write(wcove->regmap, USBC_IRQMASK2, val | USBC_IRQMASK2_ALL);
+
+       tcpm_unregister_port(wcove->tcpm);
+
+       return 0;
+}
+
+static struct platform_driver wcove_typec_driver = {
+       .driver = {
+               .name           = "bxt_wcove_usbc",
+       },
+       .probe                  = wcove_typec_probe,
+       .remove                 = wcove_typec_remove,
+};
+
+module_platform_driver(wcove_typec_driver);
+
+MODULE_AUTHOR("Intel Corporation");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("WhiskeyCove PMIC USB Type-C PHY driver");
+MODULE_ALIAS("platform:bxt_wcove_usbc");
diff --git a/drivers/usb/typec/typec_wcove.c b/drivers/usb/typec/typec_wcove.c
deleted file mode 100644 (file)
index 423208e..0000000
+++ /dev/null
@@ -1,693 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/**
- * typec_wcove.c - WhiskeyCove PMIC USB Type-C PHY driver
- *
- * Copyright (C) 2017 Intel Corporation
- * Author: Heikki Krogerus <heikki.krogerus@linux.intel.com>
- */
-
-#include <linux/acpi.h>
-#include <linux/module.h>
-#include <linux/usb/tcpm.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/mfd/intel_soc_pmic.h>
-
-/* Register offsets */
-#define WCOVE_CHGRIRQ0         0x4e09
-
-#define USBC_CONTROL1          0x7001
-#define USBC_CONTROL2          0x7002
-#define USBC_CONTROL3          0x7003
-#define USBC_CC1_CTRL          0x7004
-#define USBC_CC2_CTRL          0x7005
-#define USBC_STATUS1           0x7007
-#define USBC_STATUS2           0x7008
-#define USBC_STATUS3           0x7009
-#define USBC_CC1               0x700a
-#define USBC_CC2               0x700b
-#define USBC_CC1_STATUS                0x700c
-#define USBC_CC2_STATUS                0x700d
-#define USBC_IRQ1              0x7015
-#define USBC_IRQ2              0x7016
-#define USBC_IRQMASK1          0x7017
-#define USBC_IRQMASK2          0x7018
-#define USBC_PDCFG2            0x701a
-#define USBC_PDCFG3            0x701b
-#define USBC_PDSTATUS          0x701c
-#define USBC_RXSTATUS          0x701d
-#define USBC_RXINFO            0x701e
-#define USBC_TXCMD             0x701f
-#define USBC_TXINFO            0x7020
-#define USBC_RX_DATA           0x7028
-#define USBC_TX_DATA           0x7047
-
-/* Register bits */
-
-#define USBC_CONTROL1_MODE_MASK                0x3
-#define   USBC_CONTROL1_MODE_SNK       0
-#define   USBC_CONTROL1_MODE_SNKACC    1
-#define   USBC_CONTROL1_MODE_SRC       2
-#define   USBC_CONTROL1_MODE_SRCACC    3
-#define   USBC_CONTROL1_MODE_DRP       4
-#define   USBC_CONTROL1_MODE_DRPACC    5
-#define   USBC_CONTROL1_MODE_TEST      7
-#define USBC_CONTROL1_CURSRC_MASK      0xc
-#define   USBC_CONTROL1_CURSRC_UA_0    (0 << 3)
-#define   USBC_CONTROL1_CURSRC_UA_80   (1 << 3)
-#define   USBC_CONTROL1_CURSRC_UA_180  (2 << 3)
-#define   USBC_CONTROL1_CURSRC_UA_330  (3 << 3)
-#define USBC_CONTROL1_DRPTOGGLE_RANDOM 0xe0
-
-#define USBC_CONTROL2_UNATT_SNK                BIT(0)
-#define USBC_CONTROL2_UNATT_SRC                BIT(1)
-#define USBC_CONTROL2_DIS_ST           BIT(2)
-
-#define USBC_CONTROL3_DET_DIS          BIT(0)
-#define USBC_CONTROL3_PD_DIS           BIT(1)
-#define USBC_CONTROL3_RESETPHY         BIT(2)
-
-#define USBC_CC_CTRL_PU_EN             BIT(0)
-#define USBC_CC_CTRL_VCONN_EN          BIT(1)
-#define USBC_CC_CTRL_TX_EN             BIT(2)
-#define USBC_CC_CTRL_PD_EN             BIT(3)
-#define USBC_CC_CTRL_CDET_EN           BIT(4)
-#define USBC_CC_CTRL_RDET_EN           BIT(5)
-#define USBC_CC_CTRL_ADC_EN            BIT(6)
-#define USBC_CC_CTRL_VBUSOK            BIT(7)
-
-#define USBC_STATUS1_DET_ONGOING       BIT(6)
-#define USBC_STATUS1_RSLT(r)           ((r) & 0xf)
-#define USBC_RSLT_NOTHING              0
-#define USBC_RSLT_SRC_DEFAULT          1
-#define USBC_RSLT_SRC_1_5A             2
-#define USBC_RSLT_SRC_3_0A             3
-#define USBC_RSLT_SNK                  4
-#define USBC_RSLT_DEBUG_ACC            5
-#define USBC_RSLT_AUDIO_ACC            6
-#define USBC_RSLT_UNDEF                        15
-#define USBC_STATUS1_ORIENT(r)         (((r) >> 4) & 0x3)
-#define USBC_ORIENT_NORMAL             1
-#define USBC_ORIENT_REVERSE            2
-
-#define USBC_STATUS2_VBUS_REQ          BIT(5)
-
-#define UCSC_CC_STATUS_SNK_RP          BIT(0)
-#define UCSC_CC_STATUS_PWRDEFSNK       BIT(1)
-#define UCSC_CC_STATUS_PWR_1P5A_SNK    BIT(2)
-#define UCSC_CC_STATUS_PWR_3A_SNK      BIT(3)
-#define UCSC_CC_STATUS_SRC_RP          BIT(4)
-#define UCSC_CC_STATUS_RX(r)           (((r) >> 5) & 0x3)
-#define   USBC_CC_STATUS_RD            1
-#define   USBC_CC_STATUS_RA            2
-
-#define USBC_IRQ1_ADCDONE1             BIT(2)
-#define USBC_IRQ1_OVERTEMP             BIT(1)
-#define USBC_IRQ1_SHORT                        BIT(0)
-
-#define USBC_IRQ2_CC_CHANGE            BIT(7)
-#define USBC_IRQ2_RX_PD                        BIT(6)
-#define USBC_IRQ2_RX_HR                        BIT(5)
-#define USBC_IRQ2_RX_CR                        BIT(4)
-#define USBC_IRQ2_TX_SUCCESS           BIT(3)
-#define USBC_IRQ2_TX_FAIL              BIT(2)
-
-#define USBC_IRQMASK1_ALL      (USBC_IRQ1_ADCDONE1 | USBC_IRQ1_OVERTEMP | \
-                                USBC_IRQ1_SHORT)
-
-#define USBC_IRQMASK2_ALL      (USBC_IRQ2_CC_CHANGE | USBC_IRQ2_RX_PD | \
-                                USBC_IRQ2_RX_HR | USBC_IRQ2_RX_CR | \
-                                USBC_IRQ2_TX_SUCCESS | USBC_IRQ2_TX_FAIL)
-
-#define USBC_PDCFG2_SOP                        BIT(0)
-#define USBC_PDCFG2_SOP_P              BIT(1)
-#define USBC_PDCFG2_SOP_PP             BIT(2)
-#define USBC_PDCFG2_SOP_P_DEBUG                BIT(3)
-#define USBC_PDCFG2_SOP_PP_DEBUG       BIT(4)
-
-#define USBC_PDCFG3_DATAROLE_SHIFT     1
-#define USBC_PDCFG3_SOP_SHIFT          2
-
-#define USBC_RXSTATUS_RXCLEAR          BIT(0)
-#define USBC_RXSTATUS_RXDATA           BIT(7)
-
-#define USBC_RXINFO_RXBYTES(i)         (((i) >> 3) & 0x1f)
-
-#define USBC_TXCMD_BUF_RDY             BIT(0)
-#define USBC_TXCMD_START               BIT(1)
-#define USBC_TXCMD_NOP                 (0 << 5)
-#define USBC_TXCMD_MSG                 (1 << 5)
-#define USBC_TXCMD_CR                  (2 << 5)
-#define USBC_TXCMD_HR                  (3 << 5)
-#define USBC_TXCMD_BIST                        (4 << 5)
-
-#define USBC_TXINFO_RETRIES(d)         (d << 3)
-
-struct wcove_typec {
-       struct mutex lock; /* device lock */
-       struct device *dev;
-       struct regmap *regmap;
-       guid_t guid;
-
-       bool vbus;
-
-       struct tcpc_dev tcpc;
-       struct tcpm_port *tcpm;
-};
-
-#define tcpc_to_wcove(_tcpc_) container_of(_tcpc_, struct wcove_typec, tcpc)
-
-enum wcove_typec_func {
-       WCOVE_FUNC_DRIVE_VBUS = 1,
-       WCOVE_FUNC_ORIENTATION,
-       WCOVE_FUNC_ROLE,
-       WCOVE_FUNC_DRIVE_VCONN,
-};
-
-enum wcove_typec_orientation {
-       WCOVE_ORIENTATION_NORMAL,
-       WCOVE_ORIENTATION_REVERSE,
-};
-
-enum wcove_typec_role {
-       WCOVE_ROLE_HOST,
-       WCOVE_ROLE_DEVICE,
-};
-
-#define WCOVE_DSM_UUID         "482383f0-2876-4e49-8685-db66211af037"
-
-static int wcove_typec_func(struct wcove_typec *wcove,
-                           enum wcove_typec_func func, int param)
-{
-       union acpi_object *obj;
-       union acpi_object tmp;
-       union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(1, &tmp);
-
-       tmp.type = ACPI_TYPE_INTEGER;
-       tmp.integer.value = param;
-
-       obj = acpi_evaluate_dsm(ACPI_HANDLE(wcove->dev), &wcove->guid, 1, func,
-                               &argv4);
-       if (!obj) {
-               dev_err(wcove->dev, "%s: failed to evaluate _DSM\n", __func__);
-               return -EIO;
-       }
-
-       ACPI_FREE(obj);
-       return 0;
-}
-
-static int wcove_init(struct tcpc_dev *tcpc)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-       int ret;
-
-       ret = regmap_write(wcove->regmap, USBC_CONTROL1, 0);
-       if (ret)
-               return ret;
-
-       /* Unmask everything */
-       ret = regmap_write(wcove->regmap, USBC_IRQMASK1, 0);
-       if (ret)
-               return ret;
-
-       return regmap_write(wcove->regmap, USBC_IRQMASK2, 0);
-}
-
-static int wcove_get_vbus(struct tcpc_dev *tcpc)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-       unsigned int cc1ctrl;
-       int ret;
-
-       ret = regmap_read(wcove->regmap, USBC_CC1_CTRL, &cc1ctrl);
-       if (ret)
-               return ret;
-
-       wcove->vbus = !!(cc1ctrl & USBC_CC_CTRL_VBUSOK);
-
-       return wcove->vbus;
-}
-
-static int wcove_set_vbus(struct tcpc_dev *tcpc, bool on, bool sink)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-
-       return wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VBUS, on);
-}
-
-static int wcove_set_vconn(struct tcpc_dev *tcpc, bool on)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-
-       return wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, on);
-}
-
-static enum typec_cc_status wcove_to_typec_cc(unsigned int cc)
-{
-       if (cc & UCSC_CC_STATUS_SNK_RP) {
-               if (cc & UCSC_CC_STATUS_PWRDEFSNK)
-                       return TYPEC_CC_RP_DEF;
-               else if (cc & UCSC_CC_STATUS_PWR_1P5A_SNK)
-                       return TYPEC_CC_RP_1_5;
-               else if (cc & UCSC_CC_STATUS_PWR_3A_SNK)
-                       return TYPEC_CC_RP_3_0;
-       } else {
-               switch (UCSC_CC_STATUS_RX(cc)) {
-               case USBC_CC_STATUS_RD:
-                       return TYPEC_CC_RD;
-               case USBC_CC_STATUS_RA:
-                       return TYPEC_CC_RA;
-               default:
-                       break;
-               }
-       }
-       return TYPEC_CC_OPEN;
-}
-
-static int wcove_get_cc(struct tcpc_dev *tcpc, enum typec_cc_status *cc1,
-                       enum typec_cc_status *cc2)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-       unsigned int cc1_status;
-       unsigned int cc2_status;
-       int ret;
-
-       ret = regmap_read(wcove->regmap, USBC_CC1_STATUS, &cc1_status);
-       if (ret)
-               return ret;
-
-       ret = regmap_read(wcove->regmap, USBC_CC2_STATUS, &cc2_status);
-       if (ret)
-               return ret;
-
-       *cc1 = wcove_to_typec_cc(cc1_status);
-       *cc2 = wcove_to_typec_cc(cc2_status);
-
-       return 0;
-}
-
-static int wcove_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-       unsigned int ctrl;
-
-       switch (cc) {
-       case TYPEC_CC_RD:
-               ctrl = USBC_CONTROL1_MODE_SNK;
-               break;
-       case TYPEC_CC_RP_DEF:
-               ctrl = USBC_CONTROL1_CURSRC_UA_80 | USBC_CONTROL1_MODE_SRC;
-               break;
-       case TYPEC_CC_RP_1_5:
-               ctrl = USBC_CONTROL1_CURSRC_UA_180 | USBC_CONTROL1_MODE_SRC;
-               break;
-       case TYPEC_CC_RP_3_0:
-               ctrl = USBC_CONTROL1_CURSRC_UA_330 | USBC_CONTROL1_MODE_SRC;
-               break;
-       case TYPEC_CC_OPEN:
-               ctrl = 0;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return regmap_write(wcove->regmap, USBC_CONTROL1, ctrl);
-}
-
-static int wcove_set_polarity(struct tcpc_dev *tcpc, enum typec_cc_polarity pol)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-
-       return wcove_typec_func(wcove, WCOVE_FUNC_ORIENTATION, pol);
-}
-
-static int wcove_set_current_limit(struct tcpc_dev *tcpc, u32 max_ma, u32 mv)
-{
-       return 0;
-}
-
-static int wcove_set_roles(struct tcpc_dev *tcpc, bool attached,
-                          enum typec_role role, enum typec_data_role data)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-       unsigned int val;
-       int ret;
-
-       ret = wcove_typec_func(wcove, WCOVE_FUNC_ROLE, data == TYPEC_HOST ?
-                              WCOVE_ROLE_HOST : WCOVE_ROLE_DEVICE);
-       if (ret)
-               return ret;
-
-       val = role;
-       val |= data << USBC_PDCFG3_DATAROLE_SHIFT;
-       val |= PD_REV20 << USBC_PDCFG3_SOP_SHIFT;
-
-       return regmap_write(wcove->regmap, USBC_PDCFG3, val);
-}
-
-static int wcove_set_pd_rx(struct tcpc_dev *tcpc, bool on)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-
-       return regmap_write(wcove->regmap, USBC_PDCFG2,
-                           on ? USBC_PDCFG2_SOP : 0);
-}
-
-static int wcove_pd_transmit(struct tcpc_dev *tcpc,
-                            enum tcpm_transmit_type type,
-                            const struct pd_message *msg)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-       unsigned int info = 0;
-       unsigned int cmd;
-       int ret;
-
-       ret = regmap_read(wcove->regmap, USBC_TXCMD, &cmd);
-       if (ret)
-               return ret;
-
-       if (!(cmd & USBC_TXCMD_BUF_RDY)) {
-               dev_warn(wcove->dev, "%s: Last transmission still ongoing!",
-                        __func__);
-               return -EBUSY;
-       }
-
-       if (msg) {
-               const u8 *data = (void *)msg;
-               int i;
-
-               for (i = 0; i < pd_header_cnt(msg->header) * 4 + 2; i++) {
-                       ret = regmap_write(wcove->regmap, USBC_TX_DATA + i,
-                                          data[i]);
-                       if (ret)
-                               return ret;
-               }
-       }
-
-       switch (type) {
-       case TCPC_TX_SOP:
-       case TCPC_TX_SOP_PRIME:
-       case TCPC_TX_SOP_PRIME_PRIME:
-       case TCPC_TX_SOP_DEBUG_PRIME:
-       case TCPC_TX_SOP_DEBUG_PRIME_PRIME:
-               info = type + 1;
-               cmd = USBC_TXCMD_MSG;
-               break;
-       case TCPC_TX_HARD_RESET:
-               cmd = USBC_TXCMD_HR;
-               break;
-       case TCPC_TX_CABLE_RESET:
-               cmd = USBC_TXCMD_CR;
-               break;
-       case TCPC_TX_BIST_MODE_2:
-               cmd = USBC_TXCMD_BIST;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       /* NOTE Setting maximum number of retries (7) */
-       ret = regmap_write(wcove->regmap, USBC_TXINFO,
-                          info | USBC_TXINFO_RETRIES(7));
-       if (ret)
-               return ret;
-
-       return regmap_write(wcove->regmap, USBC_TXCMD, cmd | USBC_TXCMD_START);
-}
-
-static int wcove_start_drp_toggling(struct tcpc_dev *tcpc,
-                                   enum typec_cc_status cc)
-{
-       struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
-       unsigned int usbc_ctrl;
-
-       usbc_ctrl = USBC_CONTROL1_MODE_DRP | USBC_CONTROL1_DRPTOGGLE_RANDOM;
-
-       switch (cc) {
-       case TYPEC_CC_RP_1_5:
-               usbc_ctrl |= USBC_CONTROL1_CURSRC_UA_180;
-               break;
-       case TYPEC_CC_RP_3_0:
-               usbc_ctrl |= USBC_CONTROL1_CURSRC_UA_330;
-               break;
-       default:
-               usbc_ctrl |= USBC_CONTROL1_CURSRC_UA_80;
-               break;
-       }
-
-       return regmap_write(wcove->regmap, USBC_CONTROL1, usbc_ctrl);
-}
-
-static int wcove_read_rx_buffer(struct wcove_typec *wcove, void *msg)
-{
-       unsigned int info;
-       int ret;
-       int i;
-
-       ret = regmap_read(wcove->regmap, USBC_RXINFO, &info);
-       if (ret)
-               return ret;
-
-       /* FIXME: Check that USBC_RXINFO_RXBYTES(info) matches the header */
-
-       for (i = 0; i < USBC_RXINFO_RXBYTES(info); i++) {
-               ret = regmap_read(wcove->regmap, USBC_RX_DATA + i, msg + i);
-               if (ret)
-                       return ret;
-       }
-
-       return regmap_write(wcove->regmap, USBC_RXSTATUS,
-                           USBC_RXSTATUS_RXCLEAR);
-}
-
-static irqreturn_t wcove_typec_irq(int irq, void *data)
-{
-       struct wcove_typec *wcove = data;
-       unsigned int usbc_irq1 = 0;
-       unsigned int usbc_irq2 = 0;
-       unsigned int cc1ctrl;
-       int ret;
-
-       mutex_lock(&wcove->lock);
-
-       /* Read.. */
-       ret = regmap_read(wcove->regmap, USBC_IRQ1, &usbc_irq1);
-       if (ret)
-               goto err;
-
-       ret = regmap_read(wcove->regmap, USBC_IRQ2, &usbc_irq2);
-       if (ret)
-               goto err;
-
-       ret = regmap_read(wcove->regmap, USBC_CC1_CTRL, &cc1ctrl);
-       if (ret)
-               goto err;
-
-       if (!wcove->tcpm)
-               goto err;
-
-       /* ..check.. */
-       if (usbc_irq1 & USBC_IRQ1_OVERTEMP) {
-               dev_err(wcove->dev, "VCONN Switch Over Temperature!\n");
-               wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, false);
-               /* REVISIT: Report an error? */
-       }
-
-       if (usbc_irq1 & USBC_IRQ1_SHORT) {
-               dev_err(wcove->dev, "VCONN Switch Short Circuit!\n");
-               wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, false);
-               /* REVISIT: Report an error? */
-       }
-
-       if (wcove->vbus != !!(cc1ctrl & USBC_CC_CTRL_VBUSOK))
-               tcpm_vbus_change(wcove->tcpm);
-
-       /* REVISIT: See if tcpm code can be made to consider Type-C HW FSMs */
-       if (usbc_irq2 & USBC_IRQ2_CC_CHANGE)
-               tcpm_cc_change(wcove->tcpm);
-
-       if (usbc_irq2 & USBC_IRQ2_RX_PD) {
-               unsigned int status;
-
-               /*
-                * FIXME: Need to check if TX is ongoing and report
-                * TX_DIREGARDED if needed?
-                */
-
-               ret = regmap_read(wcove->regmap, USBC_RXSTATUS, &status);
-               if (ret)
-                       goto err;
-
-               /* Flush all buffers */
-               while (status & USBC_RXSTATUS_RXDATA) {
-                       struct pd_message msg;
-
-                       ret = wcove_read_rx_buffer(wcove, &msg);
-                       if (ret) {
-                               dev_err(wcove->dev, "%s: RX read failed\n",
-                                       __func__);
-                               goto err;
-                       }
-
-                       tcpm_pd_receive(wcove->tcpm, &msg);
-
-                       ret = regmap_read(wcove->regmap, USBC_RXSTATUS,
-                                         &status);
-                       if (ret)
-                               goto err;
-               }
-       }
-
-       if (usbc_irq2 & USBC_IRQ2_RX_HR)
-               tcpm_pd_hard_reset(wcove->tcpm);
-
-       /* REVISIT: if (usbc_irq2 & USBC_IRQ2_RX_CR) */
-
-       if (usbc_irq2 & USBC_IRQ2_TX_SUCCESS)
-               tcpm_pd_transmit_complete(wcove->tcpm, TCPC_TX_SUCCESS);
-
-       if (usbc_irq2 & USBC_IRQ2_TX_FAIL)
-               tcpm_pd_transmit_complete(wcove->tcpm, TCPC_TX_FAILED);
-
-err:
-       /* ..and clear. */
-       if (usbc_irq1) {
-               ret = regmap_write(wcove->regmap, USBC_IRQ1, usbc_irq1);
-               if (ret)
-                       dev_WARN(wcove->dev, "%s failed to clear IRQ1\n",
-                                __func__);
-       }
-
-       if (usbc_irq2) {
-               ret = regmap_write(wcove->regmap, USBC_IRQ2, usbc_irq2);
-               if (ret)
-                       dev_WARN(wcove->dev, "%s failed to clear IRQ2\n",
-                                __func__);
-       }
-
-       /* REVISIT: Clear WhiskeyCove CHGR Type-C interrupt */
-       regmap_write(wcove->regmap, WCOVE_CHGRIRQ0, BIT(5));
-
-       mutex_unlock(&wcove->lock);
-       return IRQ_HANDLED;
-}
-
-/*
- * The following power levels should be safe to use with Joule board.
- */
-static const u32 src_pdo[] = {
-       PDO_FIXED(5000, 1500, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |
-                 PDO_FIXED_USB_COMM),
-};
-
-static const u32 snk_pdo[] = {
-       PDO_FIXED(5000, 500, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |
-                 PDO_FIXED_USB_COMM),
-       PDO_VAR(5000, 12000, 3000),
-};
-
-static struct tcpc_config wcove_typec_config = {
-       .src_pdo = src_pdo,
-       .nr_src_pdo = ARRAY_SIZE(src_pdo),
-       .snk_pdo = snk_pdo,
-       .nr_snk_pdo = ARRAY_SIZE(snk_pdo),
-
-       .operating_snk_mw = 15000,
-
-       .type = TYPEC_PORT_DRP,
-       .data = TYPEC_PORT_DRD,
-       .default_role = TYPEC_SINK,
-};
-
-static int wcove_typec_probe(struct platform_device *pdev)
-{
-       struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent);
-       struct wcove_typec *wcove;
-       int irq;
-       int ret;
-
-       wcove = devm_kzalloc(&pdev->dev, sizeof(*wcove), GFP_KERNEL);
-       if (!wcove)
-               return -ENOMEM;
-
-       mutex_init(&wcove->lock);
-       wcove->dev = &pdev->dev;
-       wcove->regmap = pmic->regmap;
-
-       irq = regmap_irq_get_virq(pmic->irq_chip_data_chgr,
-                                 platform_get_irq(pdev, 0));
-       if (irq < 0)
-               return irq;
-
-       ret = guid_parse(WCOVE_DSM_UUID, &wcove->guid);
-       if (ret)
-               return ret;
-
-       if (!acpi_check_dsm(ACPI_HANDLE(&pdev->dev), &wcove->guid, 0, 0x1f)) {
-               dev_err(&pdev->dev, "Missing _DSM functions\n");
-               return -ENODEV;
-       }
-
-       wcove->tcpc.init = wcove_init;
-       wcove->tcpc.get_vbus = wcove_get_vbus;
-       wcove->tcpc.set_vbus = wcove_set_vbus;
-       wcove->tcpc.set_cc = wcove_set_cc;
-       wcove->tcpc.get_cc = wcove_get_cc;
-       wcove->tcpc.set_polarity = wcove_set_polarity;
-       wcove->tcpc.set_vconn = wcove_set_vconn;
-       wcove->tcpc.set_current_limit = wcove_set_current_limit;
-       wcove->tcpc.start_drp_toggling = wcove_start_drp_toggling;
-
-       wcove->tcpc.set_pd_rx = wcove_set_pd_rx;
-       wcove->tcpc.set_roles = wcove_set_roles;
-       wcove->tcpc.pd_transmit = wcove_pd_transmit;
-
-       wcove->tcpc.config = &wcove_typec_config;
-
-       wcove->tcpm = tcpm_register_port(wcove->dev, &wcove->tcpc);
-       if (IS_ERR(wcove->tcpm))
-               return PTR_ERR(wcove->tcpm);
-
-       ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
-                                       wcove_typec_irq, IRQF_ONESHOT,
-                                       "wcove_typec", wcove);
-       if (ret) {
-               tcpm_unregister_port(wcove->tcpm);
-               return ret;
-       }
-
-       platform_set_drvdata(pdev, wcove);
-       return 0;
-}
-
-static int wcove_typec_remove(struct platform_device *pdev)
-{
-       struct wcove_typec *wcove = platform_get_drvdata(pdev);
-       unsigned int val;
-
-       /* Mask everything */
-       regmap_read(wcove->regmap, USBC_IRQMASK1, &val);
-       regmap_write(wcove->regmap, USBC_IRQMASK1, val | USBC_IRQMASK1_ALL);
-       regmap_read(wcove->regmap, USBC_IRQMASK2, &val);
-       regmap_write(wcove->regmap, USBC_IRQMASK2, val | USBC_IRQMASK2_ALL);
-
-       tcpm_unregister_port(wcove->tcpm);
-
-       return 0;
-}
-
-static struct platform_driver wcove_typec_driver = {
-       .driver = {
-               .name           = "bxt_wcove_usbc",
-       },
-       .probe                  = wcove_typec_probe,
-       .remove                 = wcove_typec_remove,
-};
-
-module_platform_driver(wcove_typec_driver);
-
-MODULE_AUTHOR("Intel Corporation");
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("WhiskeyCove PMIC USB Type-C PHY driver");
-MODULE_ALIAS("platform:bxt_wcove_usbc");