usb: typec: wcove: start using tcpm for USB PD support

This patch makes the driver work with USB Type-C Port
Manager (tcpm.c) to provide USB PD functionality.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heikki Krogerus 2017-09-20 12:54:42 +03:00 committed by Greg Kroah-Hartman
parent 598b98f24a
commit 3c4fb9f169
2 changed files with 465 additions and 169 deletions
drivers/usb/typec

View File

@ -16,8 +16,6 @@ if TYPEC_TCPM
source "drivers/usb/typec/fusb302/Kconfig" source "drivers/usb/typec/fusb302/Kconfig"
endif
config TYPEC_WCOVE config TYPEC_WCOVE
tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver" tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
depends on ACPI depends on ACPI
@ -33,6 +31,8 @@ config TYPEC_WCOVE
To compile this driver as module, choose M here: the module will be To compile this driver as module, choose M here: the module will be
called typec_wcove called typec_wcove
endif
source "drivers/usb/typec/ucsi/Kconfig" source "drivers/usb/typec/ucsi/Kconfig"
endmenu endmenu

View File

@ -11,14 +11,13 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/usb/tcpm.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/usb/typec.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/intel_soc_pmic.h> #include <linux/mfd/intel_soc_pmic.h>
/* Register offsets */ /* Register offsets */
#define WCOVE_CHGRIRQ0 0x4e09 #define WCOVE_CHGRIRQ0 0x4e09
#define WCOVE_PHYCTRL 0x5e07
#define USBC_CONTROL1 0x7001 #define USBC_CONTROL1 0x7001
#define USBC_CONTROL2 0x7002 #define USBC_CONTROL2 0x7002
@ -28,22 +27,57 @@
#define USBC_STATUS1 0x7007 #define USBC_STATUS1 0x7007
#define USBC_STATUS2 0x7008 #define USBC_STATUS2 0x7008
#define USBC_STATUS3 0x7009 #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_IRQ1 0x7015
#define USBC_IRQ2 0x7016 #define USBC_IRQ2 0x7016
#define USBC_IRQMASK1 0x7017 #define USBC_IRQMASK1 0x7017
#define USBC_IRQMASK2 0x7018 #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 */ /* Register bits */
#define USBC_CONTROL1_MODE_DRP(r) (((r) & ~0x7) | 4) #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_SNK BIT(0)
#define USBC_CONTROL2_UNATT_SRC BIT(1) #define USBC_CONTROL2_UNATT_SRC BIT(1)
#define USBC_CONTROL2_DIS_ST BIT(2) #define USBC_CONTROL2_DIS_ST BIT(2)
#define USBC_CONTROL3_DET_DIS BIT(0)
#define USBC_CONTROL3_PD_DIS BIT(1) #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_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_DET_ONGOING BIT(6)
#define USBC_STATUS1_RSLT(r) ((r) & 0xf) #define USBC_STATUS1_RSLT(r) ((r) & 0xf)
@ -61,6 +95,15 @@
#define USBC_STATUS2_VBUS_REQ BIT(5) #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_ADCDONE1 BIT(2)
#define USBC_IRQ1_OVERTEMP BIT(1) #define USBC_IRQ1_OVERTEMP BIT(1)
#define USBC_IRQ1_SHORT BIT(0) #define USBC_IRQ1_SHORT BIT(0)
@ -79,15 +122,44 @@
USBC_IRQ2_RX_HR | USBC_IRQ2_RX_CR | \ USBC_IRQ2_RX_HR | USBC_IRQ2_RX_CR | \
USBC_IRQ2_TX_SUCCESS | USBC_IRQ2_TX_FAIL) 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 wcove_typec {
struct mutex lock; /* device lock */ struct mutex lock; /* device lock */
struct device *dev; struct device *dev;
struct regmap *regmap; struct regmap *regmap;
struct typec_port *port; guid_t guid;
struct typec_capability cap;
struct typec_partner *partner; 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 { enum wcove_typec_func {
WCOVE_FUNC_DRIVE_VBUS = 1, WCOVE_FUNC_DRIVE_VBUS = 1,
WCOVE_FUNC_ORIENTATION, WCOVE_FUNC_ORIENTATION,
@ -105,8 +177,7 @@ enum wcove_typec_role {
WCOVE_ROLE_DEVICE, WCOVE_ROLE_DEVICE,
}; };
static guid_t guid = GUID_INIT(0x482383f0, 0x2876, 0x4e49, #define WCOVE_DSM_UUID "482383f0-2876-4e49-8685-db66211af037"
0x86, 0x85, 0xdb, 0x66, 0x21, 0x1a, 0xf0, 0x37);
static int wcove_typec_func(struct wcove_typec *wcove, static int wcove_typec_func(struct wcove_typec *wcove,
enum wcove_typec_func func, int param) enum wcove_typec_func func, int param)
@ -118,7 +189,7 @@ static int wcove_typec_func(struct wcove_typec *wcove,
tmp.type = ACPI_TYPE_INTEGER; tmp.type = ACPI_TYPE_INTEGER;
tmp.integer.value = param; tmp.integer.value = param;
obj = acpi_evaluate_dsm(ACPI_HANDLE(wcove->dev), &guid, 1, func, obj = acpi_evaluate_dsm(ACPI_HANDLE(wcove->dev), &wcove->guid, 1, func,
&argv4); &argv4);
if (!obj) { if (!obj) {
dev_err(wcove->dev, "%s: failed to evaluate _DSM\n", __func__); dev_err(wcove->dev, "%s: failed to evaluate _DSM\n", __func__);
@ -129,158 +200,349 @@ static int wcove_typec_func(struct wcove_typec *wcove,
return 0; return 0;
} }
static int wcove_init(struct tcpc_dev *tcpc)
{
struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
int 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)
{
/* XXX: Relying on the HW FSM to configure things correctly for now */
return 0;
}
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) static irqreturn_t wcove_typec_irq(int irq, void *data)
{ {
enum typec_role role = TYPEC_SINK;
struct typec_partner_desc partner;
struct wcove_typec *wcove = data; struct wcove_typec *wcove = data;
unsigned int cc1_ctrl; unsigned int usbc_irq1;
unsigned int cc2_ctrl; unsigned int usbc_irq2;
unsigned int cc_irq1; unsigned int cc1ctrl;
unsigned int cc_irq2;
unsigned int status1;
unsigned int status2;
int ret; int ret;
mutex_lock(&wcove->lock); mutex_lock(&wcove->lock);
ret = regmap_read(wcove->regmap, USBC_IRQ1, &cc_irq1); /* Read.. */
ret = regmap_read(wcove->regmap, USBC_IRQ1, &usbc_irq1);
if (ret) if (ret)
goto err; goto err;
ret = regmap_read(wcove->regmap, USBC_IRQ2, &cc_irq2); ret = regmap_read(wcove->regmap, USBC_IRQ2, &usbc_irq2);
if (ret) if (ret)
goto err; goto err;
ret = regmap_read(wcove->regmap, USBC_STATUS1, &status1); ret = regmap_read(wcove->regmap, USBC_CC1_CTRL, &cc1ctrl);
if (ret) if (ret)
goto err; goto err;
ret = regmap_read(wcove->regmap, USBC_STATUS2, &status2); if (!wcove->tcpm)
if (ret)
goto err; goto err;
ret = regmap_read(wcove->regmap, USBC_CC1_CTRL, &cc1_ctrl); /* ..check.. */
if (ret) if (usbc_irq1 & USBC_IRQ1_OVERTEMP) {
goto err;
ret = regmap_read(wcove->regmap, USBC_CC2_CTRL, &cc2_ctrl);
if (ret)
goto err;
if (cc_irq1) {
if (cc_irq1 & USBC_IRQ1_OVERTEMP)
dev_err(wcove->dev, "VCONN Switch Over Temperature!\n"); dev_err(wcove->dev, "VCONN Switch Over Temperature!\n");
if (cc_irq1 & USBC_IRQ1_SHORT)
dev_err(wcove->dev, "VCONN Switch Short Circuit!\n");
ret = regmap_write(wcove->regmap, USBC_IRQ1, cc_irq1);
if (ret)
goto err;
}
if (cc_irq2) {
ret = regmap_write(wcove->regmap, USBC_IRQ2, cc_irq2);
if (ret)
goto err;
/*
* Ignoring any PD communication interrupts until the PD support
* is available
*/
if (cc_irq2 & ~USBC_IRQ2_CC_CHANGE) {
dev_WARN(wcove->dev, "USB PD handling missing\n");
goto err;
}
}
if (status1 & USBC_STATUS1_DET_ONGOING)
goto out;
if (USBC_STATUS1_RSLT(status1) == USBC_RSLT_NOTHING) {
if (wcove->partner) {
typec_unregister_partner(wcove->partner);
wcove->partner = NULL;
}
wcove_typec_func(wcove, WCOVE_FUNC_ORIENTATION,
WCOVE_ORIENTATION_NORMAL);
/* This makes sure the device controller is disconnected */
wcove_typec_func(wcove, WCOVE_FUNC_ROLE, WCOVE_ROLE_HOST);
/* Port to default role */
typec_set_data_role(wcove->port, TYPEC_DEVICE);
typec_set_pwr_role(wcove->port, TYPEC_SINK);
typec_set_pwr_opmode(wcove->port, TYPEC_PWR_MODE_USB);
goto out;
}
if (wcove->partner)
goto out;
switch (USBC_STATUS1_ORIENT(status1)) {
case USBC_ORIENT_NORMAL:
wcove_typec_func(wcove, WCOVE_FUNC_ORIENTATION,
WCOVE_ORIENTATION_NORMAL);
break;
case USBC_ORIENT_REVERSE:
wcove_typec_func(wcove, WCOVE_FUNC_ORIENTATION,
WCOVE_ORIENTATION_REVERSE);
default:
break;
}
memset(&partner, 0, sizeof(partner));
switch (USBC_STATUS1_RSLT(status1)) {
case USBC_RSLT_SRC_DEFAULT:
typec_set_pwr_opmode(wcove->port, TYPEC_PWR_MODE_USB);
break;
case USBC_RSLT_SRC_1_5A:
typec_set_pwr_opmode(wcove->port, TYPEC_PWR_MODE_1_5A);
break;
case USBC_RSLT_SRC_3_0A:
typec_set_pwr_opmode(wcove->port, TYPEC_PWR_MODE_3_0A);
break;
case USBC_RSLT_SNK:
role = TYPEC_SOURCE;
break;
case USBC_RSLT_DEBUG_ACC:
partner.accessory = TYPEC_ACCESSORY_DEBUG;
break;
case USBC_RSLT_AUDIO_ACC:
partner.accessory = TYPEC_ACCESSORY_AUDIO;
break;
default:
dev_WARN(wcove->dev, "%s Undefined result\n", __func__);
goto err;
}
if (role == TYPEC_SINK) {
wcove_typec_func(wcove, WCOVE_FUNC_ROLE, WCOVE_ROLE_DEVICE);
typec_set_data_role(wcove->port, TYPEC_DEVICE);
typec_set_pwr_role(wcove->port, TYPEC_SINK);
} else {
wcove_typec_func(wcove, WCOVE_FUNC_ROLE, WCOVE_ROLE_HOST);
typec_set_pwr_role(wcove->port, TYPEC_SOURCE);
typec_set_data_role(wcove->port, TYPEC_HOST);
}
wcove->partner = typec_register_partner(wcove->port, &partner);
if (!wcove->partner)
dev_err(wcove->dev, "failed register partner\n");
out:
/* If either CC pins is requesting VCONN, we turn it on */
if ((cc1_ctrl & USBC_CC_CTRL_VCONN_EN) ||
(cc2_ctrl & USBC_CC_CTRL_VCONN_EN))
wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, true);
else
wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, false); 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);
/* Relying on the FSM to know when we need to drive VBUS. */
wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VBUS,
!!(status2 & USBC_STATUS2_VBUS_REQ));
err: 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 */ /* REVISIT: Clear WhiskeyCove CHGR Type-C interrupt */
regmap_write(wcove->regmap, WCOVE_CHGRIRQ0, BIT(5)); regmap_write(wcove->regmap, WCOVE_CHGRIRQ0, BIT(5));
@ -288,11 +550,41 @@ static irqreturn_t wcove_typec_irq(int irq, void *data)
return IRQ_HANDLED; 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(12000, 3000, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |
PDO_FIXED_USB_COMM),
PDO_BATT(4750, 12000, 15000),
PDO_VAR(4750, 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),
.max_snk_mv = 12000,
.max_snk_ma = 3000,
.max_snk_mw = 36000,
.operating_snk_mw = 15000,
.type = TYPEC_PORT_DRP,
.default_role = TYPEC_SINK,
};
static int wcove_typec_probe(struct platform_device *pdev) static int wcove_typec_probe(struct platform_device *pdev)
{ {
struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent); struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent);
struct wcove_typec *wcove; struct wcove_typec *wcove;
unsigned int val; int irq;
int ret; int ret;
wcove = devm_kzalloc(&pdev->dev, sizeof(*wcove), GFP_KERNEL); wcove = devm_kzalloc(&pdev->dev, sizeof(*wcove), GFP_KERNEL);
@ -303,43 +595,47 @@ static int wcove_typec_probe(struct platform_device *pdev)
wcove->dev = &pdev->dev; wcove->dev = &pdev->dev;
wcove->regmap = pmic->regmap; wcove->regmap = pmic->regmap;
ret = regmap_irq_get_virq(pmic->irq_chip_data_chgr, irq = regmap_irq_get_virq(pmic->irq_chip_data_chgr,
platform_get_irq(pdev, 0)); platform_get_irq(pdev, 0));
if (ret < 0) if (irq < 0)
return ret; return irq;
ret = devm_request_threaded_irq(&pdev->dev, ret, NULL, ret = guid_parse(WCOVE_DSM_UUID, &wcove->guid);
wcove_typec_irq, IRQF_ONESHOT,
"wcove_typec", wcove);
if (ret) if (ret)
return ret; return ret;
if (!acpi_check_dsm(ACPI_HANDLE(&pdev->dev), &guid, 0, 0x1f)) { if (!acpi_check_dsm(ACPI_HANDLE(&pdev->dev), &wcove->guid, 0, 0x1f)) {
dev_err(&pdev->dev, "Missing _DSM functions\n"); dev_err(&pdev->dev, "Missing _DSM functions\n");
return -ENODEV; return -ENODEV;
} }
wcove->cap.type = TYPEC_PORT_DRP; wcove->tcpc.init = wcove_init;
wcove->cap.revision = USB_TYPEC_REV_1_1; wcove->tcpc.get_vbus = wcove_get_vbus;
wcove->cap.prefer_role = TYPEC_NO_PREFERRED_ROLE; 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;
/* Make sure the PD PHY is disabled until USB PD is available */ wcove->tcpc.set_pd_rx = wcove_set_pd_rx;
regmap_read(wcove->regmap, USBC_CONTROL3, &val); wcove->tcpc.set_roles = wcove_set_roles;
regmap_write(wcove->regmap, USBC_CONTROL3, val | USBC_CONTROL3_PD_DIS); wcove->tcpc.pd_transmit = wcove_pd_transmit;
/* DRP mode without accessory support */ wcove->tcpc.config = &wcove_typec_config;
regmap_read(wcove->regmap, USBC_CONTROL1, &val);
regmap_write(wcove->regmap, USBC_CONTROL1, USBC_CONTROL1_MODE_DRP(val));
wcove->port = typec_register_port(&pdev->dev, &wcove->cap); wcove->tcpm = tcpm_register_port(wcove->dev, &wcove->tcpc);
if (!wcove->port) if (IS_ERR(wcove->tcpm))
return -ENODEV; return PTR_ERR(wcove->tcpm);
/* Unmask everything */ ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
regmap_read(wcove->regmap, USBC_IRQMASK1, &val); wcove_typec_irq, IRQF_ONESHOT,
regmap_write(wcove->regmap, USBC_IRQMASK1, val & ~USBC_IRQMASK1_ALL); "wcove_typec", wcove);
regmap_read(wcove->regmap, USBC_IRQMASK2, &val); if (ret) {
regmap_write(wcove->regmap, USBC_IRQMASK2, val & ~USBC_IRQMASK2_ALL); tcpm_unregister_port(wcove->tcpm);
return ret;
}
platform_set_drvdata(pdev, wcove); platform_set_drvdata(pdev, wcove);
return 0; return 0;
@ -356,8 +652,8 @@ static int wcove_typec_remove(struct platform_device *pdev)
regmap_read(wcove->regmap, USBC_IRQMASK2, &val); regmap_read(wcove->regmap, USBC_IRQMASK2, &val);
regmap_write(wcove->regmap, USBC_IRQMASK2, val | USBC_IRQMASK2_ALL); regmap_write(wcove->regmap, USBC_IRQMASK2, val | USBC_IRQMASK2_ALL);
typec_unregister_partner(wcove->partner); tcpm_unregister_port(wcove->tcpm);
typec_unregister_port(wcove->port);
return 0; return 0;
} }