Received: by 10.213.65.68 with SMTP id h4csp89461imn; Fri, 16 Mar 2018 19:18:03 -0700 (PDT) X-Google-Smtp-Source: AG47ELvv7slxgJWa5EWQieZPI4LMiwfmFTEANErhbRiee01QK8f14wEeN9ln9tOv+lG6zS/HMUOn X-Received: by 2002:a17:902:2f81:: with SMTP id t1-v6mr4274350plb.290.1521253083896; Fri, 16 Mar 2018 19:18:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521253083; cv=none; d=google.com; s=arc-20160816; b=S5ZaYdpW26ZG5VbzGLctCkjctZHKSy6PnTu4XtxBA2tcqXZr1pXsK/FtCKNl0WRkKX a6qjikM+QXsO1wpr+UYKI0chtSsvafZqmf0TcTCNTEvvDhSFwm/AOGnvhq6TXdY7MfbN VnbVPl/uvaZE+O+TlIqJAN2TYkOvKqXjn/AWEFgbnp0CvTszfjvTQpac0oeQnQCGEdiE CVlU6rFe5CW1scb3PZ+czmJIlkXfbolnhf4H/G7YFKu3E2gq+X3LRrynh8axFgbjrvGa 8jloPBP7pQMvxO+aWuM6Qopbg3KFWKpDYaKVWY7YdOhRSMHX0f9WUP/Kc3rti92HIjMK hCXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature :arc-authentication-results; bh=uA9XTPhC66Rnjnuax+b6J4+571EIaKUSRIZbwXaxqDA=; b=0otbbNA3SB5T65UncwEV0qvzco1VZwRl9aPFFOqIwrsLSjl5mPE9MRa4NnyAa8BCrY 3YVnvmD2xOZlfjivetQXwr7MELKfeqExHud8f+olFMSZTk+YBA4qJ44s3oB7DEysN/UG 5OWZ25+W8Womi8V9LqrV0WEyTqnmmlDuXcE11jxQOXPR3NtslRnxZxHIOZ82G1q8ycAt 9quG6ld+5mX0m4v/mEorqTwq/bY4xsxDHQjf2i3R6NRD7/RjrzzXwJqHR36fdnJFqCRg BvSO1Eb6/0coi4aDqn0KQMrzn8EKdgnm9QbQTNIuvhDiHnaN7azc6WkmiCpNleVc63Pq HAyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=jJhnuDq4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w1si5975998pge.362.2018.03.16.19.17.36; Fri, 16 Mar 2018 19:18:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=jJhnuDq4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752478AbeCQCQN (ORCPT + 99 others); Fri, 16 Mar 2018 22:16:13 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34573 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751372AbeCQCQL (ORCPT ); Fri, 16 Mar 2018 22:16:11 -0400 Received: by mail-pf0-f195.google.com with SMTP id j20so4880523pfi.1; Fri, 16 Mar 2018 19:16:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=uA9XTPhC66Rnjnuax+b6J4+571EIaKUSRIZbwXaxqDA=; b=jJhnuDq4WFdcBAliVWy2ZOfotzQAvpiVoCASHEgRSy30vsfPYvALMPxgIbxGfDtvd7 ZE4SEXsgQnWMO31rODi0O7jXkgDx1QUD7x+zxABYmh72c+GzaTH4h0C3JQPWOGN7g2Yp eW4U2KR2OHCaeT6jOK1Ms0jXqfTe0IAgJ2W1BHfEtEuZpbiRAm3WkOCjWPM+uifIrKwo Q5lAFrSJne680NChNyD1CAY1ievilAGNqQK34tYbYYXNqs9n1mJQQuVnDRTf6ew6w8p5 /4E76AOMT+Svp051inKgMp0tDOBpcK85ScwzB0YvBXUPqkbAIeGDzj6CzA9byn/Q1goG PGbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=uA9XTPhC66Rnjnuax+b6J4+571EIaKUSRIZbwXaxqDA=; b=RrV7BtaZ1YBIvM+cGCMyZEFT0yof0wVukU2kAvZng3F35lGJOIyv2WZR8sxWPCiQg6 HlPaCErT02/E3nNp0FDvacfzGPE4X2kXDxWeWgdv5XJBmdy5eMDLrk6WBMBOpDBjjC+/ wCo5md4WKkb9rbMI/3oWLuV9lb8aqodmXglBDwlCil7306dapBv0SZPgkcbfR08quGIL v9nJ8VaicD1/0LYMNrU8BmOK86/sOozxrX/UNTvrEPeuSkVO/F3Jot+JCyPvpNyr2oLa VO0/bGredKjSOeO0OJoR1l/zxxG4oTZ7/ZywxFzdiHignbt3vNPqNMf6k0Xs7hPGLN8T 139A== X-Gm-Message-State: AElRT7GuM38EFYzNAJOWApcTPbcs3F8k01tbdOFDJGAlTJmjYgYBJs/e 3p0Q38yA/WGTuNfLJq8H7q96DQ== X-Received: by 10.98.60.15 with SMTP id j15mr3493627pfa.7.1521252970812; Fri, 16 Mar 2018 19:16:10 -0700 (PDT) Received: from server.roeck-us.net (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id 68sm16710434pfx.130.2018.03.16.19.16.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Mar 2018 19:16:10 -0700 (PDT) Subject: Re: [PATCH v2] staging: typec: rt1711h typec chip driver To: ShuFan Lee , greg@kroah.com, heikki.krogerus@linux.intel.com Cc: shufan_lee@richtek.com, cy_huang@richtek.com, jun.li@nxp.com, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org References: <1521222040-30349-1-git-send-email-leechu729@gmail.com> From: Guenter Roeck Message-ID: <7ebc0dac-db70-3635-27c2-97ce0b5b9f4c@roeck-us.net> Date: Fri, 16 Mar 2018 19:16:08 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <1521222040-30349-1-git-send-email-leechu729@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/16/2018 10:40 AM, ShuFan Lee wrote: > From: ShuFan Lee > > Richtek RT1711H Type-C chip driver that works with > Type-C Port Controller Manager to provide USB PD and > USB Type-C functionalities. > Add definition of TCPC_CC_STATUS_TOGGLING. > > Signed-off-by: ShuFan Lee Does this patch require DT review for the bindings ? Gueter > --- > drivers/staging/typec/Kconfig | 8 + > drivers/staging/typec/Makefile | 1 + > drivers/staging/typec/tcpci.h | 1 + > drivers/staging/typec/tcpci_rt1711h.c | 329 ++++++++++++++++++++++++++++++++++ > 4 files changed, 339 insertions(+) > create mode 100644 drivers/staging/typec/tcpci_rt1711h.c > > changelogs between v1 and v2 > - use gpiod_* instead of gpio_* > > diff --git a/drivers/staging/typec/Kconfig b/drivers/staging/typec/Kconfig > index 5359f556d203..3aa981fbc8f5 100644 > --- a/drivers/staging/typec/Kconfig > +++ b/drivers/staging/typec/Kconfig > @@ -9,6 +9,14 @@ config TYPEC_TCPCI > help > Type-C Port Controller driver for TCPCI-compliant controller. > > +config TYPEC_RT1711H > + tristate "Richtek RT1711H Type-C chip driver" > + 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. > + > endif > > endmenu > diff --git a/drivers/staging/typec/Makefile b/drivers/staging/typec/Makefile > index 53d649abcb53..7803d485e1b3 100644 > --- a/drivers/staging/typec/Makefile > +++ b/drivers/staging/typec/Makefile > @@ -1 +1,2 @@ > obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o > +obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o > diff --git a/drivers/staging/typec/tcpci.h b/drivers/staging/typec/tcpci.h > index 34c865f0dcf6..303ebde26546 100644 > --- a/drivers/staging/typec/tcpci.h > +++ b/drivers/staging/typec/tcpci.h > @@ -59,6 +59,7 @@ > #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 > diff --git a/drivers/staging/typec/tcpci_rt1711h.c b/drivers/staging/typec/tcpci_rt1711h.c > new file mode 100644 > index 000000000000..12afac363d6d > --- /dev/null > +++ b/drivers/staging/typec/tcpci_rt1711h.c > @@ -0,0 +1,329 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2018, Richtek Technology Corporation > + * > + * Richtek RT1711H Type-C Chip Driver > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include "tcpci.h" > + > +#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; > + int irq; > +}; > + > +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 ? 0 : 1, 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_gpio(struct rt1711h_chip *chip) > +{ > + struct gpio_desc *gpio; > + > + gpio = devm_gpiod_get(chip->dev, "rt,intr", GPIOD_IN); > + if (IS_ERR(gpio)) > + return PTR_ERR(gpio); > + > + chip->irq = gpiod_to_irq(gpio); > + if (chip->irq < 0) > + return chip->irq; > + return 0; > +} > + > +static int rt1711h_init_alert(struct rt1711h_chip *chip) > +{ > + int ret; > + > + /* Disable chip interrupts before requesting irq */ > + ret = rt1711h_write16(chip, TCPC_ALERT_MASK, 0); > + if (ret < 0) > + return ret; > + > + if (!chip->irq) { > + ret = rt1711h_init_gpio(chip); > + if (ret < 0) > + return ret; > + } > + ret = devm_request_threaded_irq(chip->dev, chip->irq, NULL, > + rt1711h_irq, > + IRQF_ONESHOT | IRQF_TRIGGER_LOW, > + dev_name(chip->dev), chip); > + if (ret < 0) > + return ret; > + enable_irq_wake(chip->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 != 0x29cf) { > + 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 != 0x1711) { > + 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->irq = client->irq; > + chip->dev = &client->dev; > + i2c_set_clientdata(client, chip); > + > + ret = rt1711h_sw_reset(chip); > + if (ret < 0) > + return ret; > + > + ret = rt1711h_init_alert(chip); > + 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 "); > +MODULE_DESCRIPTION("RT1711H USB Type-C Port Controller Interface Driver"); > +MODULE_LICENSE("GPL"); >