From patchwork Thu Aug 27 11:18:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cy_huang X-Patchwork-Id: 258746 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4BF3C433E3 for ; Thu, 27 Aug 2020 15:22:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8821222CAF for ; Thu, 27 Aug 2020 15:22:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="njwip9Ot" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727821AbgH0PV7 (ORCPT ); Thu, 27 Aug 2020 11:21:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728696AbgH0LcR (ORCPT ); Thu, 27 Aug 2020 07:32:17 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A58DC061264; Thu, 27 Aug 2020 04:19:15 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id k18so3232250pfp.7; Thu, 27 Aug 2020 04:19:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ezC+r3YwpKVy+03QFUWjpev8y2+TmsNBfqy2y9Sv7nA=; b=njwip9OteVbnU53kYGdWeEMhJ/hlw2I6O8fXTEhcJRokjrdqzvTUnJLfbUvZ6wTpQs SdO+UI2tbRBZqAoIuGTl8tVrYtWFoEqDBOdUOxcmY+wScfxstyXVXiX9mn3YMEyHC0te eeY1gp9Et/wd27x2VTOfC3qJHrfKtBUYMBCsykzOgGoOGC71lkJZYM2JAa2Mq0UnhF9c r5OFttSiWMrC2J1cTo1qbntPShmRwzdt8hcTzlliJe5yTdu/s1kUgkfjdfBPyy9WhW6k pqRZUEEby8XKlMBqbdWFgtIEBrO6JL522uJ0suI26ZMJBjD12j2qxPXJrfrMiVrbPf/s TK+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ezC+r3YwpKVy+03QFUWjpev8y2+TmsNBfqy2y9Sv7nA=; b=itTQuldj0EmOp1DeabzDK6eYpExuOeyJj305Hqlt88KqS5mB5nMkYrnqJXS4Eyv25x O7M5EL0PQmA2G1Qe/iwy2JQtWIu9BBGNxmNx4BCtWpa6DXVWrn0rLD4hSQ121SUqSdKh 1Z6Vhk9kHH8B6orK1oC2kRBiNqsSy1J6oIld2618HeNK+evjRs8PRuVDWQN6BW/45t0C dESYZJFwzA4oLzf3IOTwidqsbKH9MLJ9mLtmkr5rgX9YNCYLiY/Uz5fPt6u9d0p9rrVx qfK1ezUgWv4jff0Qy31DI9/pb9KR/TO0TzScjZhMpaFUKjUSJnl790EUczT0lvJKt7mi E8sg== X-Gm-Message-State: AOAM5303R29xecrR1EBfrHEogcrhUshLMzQaSeZ2Xi6R04s986S532Xs p4C2Ykd+GzKrf4oQFzIw43k= X-Google-Smtp-Source: ABdhPJz1riIoixopfph84TM+/NFmzd1shmOghN8yKei0D1odJDN1b2CsleH5KGm9ES2tc5eTvw+2Lw== X-Received: by 2002:aa7:9219:: with SMTP id 25mr16247625pfo.4.1598527154547; Thu, 27 Aug 2020 04:19:14 -0700 (PDT) Received: from localhost.localdomain ([2402:7500:46b:c678:1129:dc1b:b8d8:6430]) by smtp.gmail.com with ESMTPSA id h64sm2411609pfe.201.2020.08.27.04.19.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 04:19:13 -0700 (PDT) From: cy_huang To: gregkh@linuxfoundation.org, robh+dt@kernel.org, matthias.bgg@gmail.com, linux@roeck-us.net, heikki.krogerus@linux.intel.com Cc: cy_huang@richtek.com, gene_chen@richtek.com, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] usb typec: mt6360: Add support for mt6360 Type-C driver Date: Thu, 27 Aug 2020 19:18:55 +0800 Message-Id: <1598527137-6915-1-git-send-email-u0084500@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: ChiYuan Huang Mediatek MT6360 is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities. v1 to v2 1. Add fix to Prevent the race condition from interrupt and tcpci port unregister during module remove. v2 to v3 1. Change comment style for the head of source code. 2. No need to print error for platform_get_irq_byname. 3. Fix tcpci_register_port check from IS_ERR_OR_NULL to IS_ERR. 4. Rename driver/Kconfig/Makefile form mt6360 to mt636x. 5. Rename DT binding documents from mt6360 to mt636x. Signed-off-by: ChiYuan Huang --- drivers/usb/typec/tcpm/Kconfig | 8 ++ drivers/usb/typec/tcpm/Makefile | 1 + drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.c diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig index fa3f393..58a64e1 100644 --- a/drivers/usb/typec/tcpm/Kconfig +++ b/drivers/usb/typec/tcpm/Kconfig @@ -27,6 +27,14 @@ config TYPEC_RT1711H Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities. +config TYPEC_MT6360 + tristate "Mediatek MT6360 Type-C driver" + depends on MFD_MT6360 + help + Mediatek MT6360 is a multi-functional IC that includes + USB Type-C. It works with Type-C Port Controller Manager + to provide USB PD and USB Type-C functionalities. + endif # TYPEC_TCPCI config TYPEC_FUSB302 diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile index a5ff6c8..7592ccb 100644 --- a/drivers/usb/typec/tcpm/Makefile +++ b/drivers/usb/typec/tcpm/Makefile @@ -5,3 +5,4 @@ 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 +obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.o diff --git a/drivers/usb/typec/tcpm/tcpci_mt6360.c b/drivers/usb/typec/tcpm/tcpci_mt6360.c new file mode 100644 index 00000000..f1bd9e0 --- /dev/null +++ b/drivers/usb/typec/tcpm/tcpci_mt6360.c @@ -0,0 +1,212 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2020 MediaTek Inc. + * + * Author: ChiYuan Huang + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "tcpci.h" + +#define MT6360_REG_VCONNCTRL1 0x8C +#define MT6360_REG_MODECTRL2 0x8F +#define MT6360_REG_SWRESET 0xA0 +#define MT6360_REG_DEBCTRL1 0xA1 +#define MT6360_REG_DRPCTRL1 0xA2 +#define MT6360_REG_DRPCTRL2 0xA3 +#define MT6360_REG_I2CTORST 0xBF +#define MT6360_REG_RXCTRL2 0xCF +#define MT6360_REG_CTDCTRL2 0xEC + +/* MT6360_REG_VCONNCTRL1 */ +#define MT6360_VCONNCL_ENABLE BIT(0) +/* MT6360_REG_RXCTRL2 */ +#define MT6360_OPEN40M_ENABLE BIT(7) +/* MT6360_REG_CTDCTRL2 */ +#define MT6360_RPONESHOT_ENABLE BIT(6) + +struct mt6360_tcpc_info { + struct tcpci_data tdata; + struct tcpci *tcpci; + struct device *dev; + int irq; +}; + +static inline int mt6360_tcpc_read16(struct regmap *regmap, + unsigned int reg, u16 *val) +{ + return regmap_raw_read(regmap, reg, val, sizeof(u16)); +} + +static inline int mt6360_tcpc_write16(struct regmap *regmap, + unsigned int reg, u16 val) +{ + return regmap_raw_write(regmap, reg, &val, sizeof(u16)); +} + +static int mt6360_tcpc_init(struct tcpci *tcpci, struct tcpci_data *tdata) +{ + struct regmap *regmap = tdata->regmap; + int ret; + + ret = regmap_write(regmap, MT6360_REG_SWRESET, 0x01); + if (ret) + return ret; + + /* after reset command, wait 1~2ms to wait IC action */ + usleep_range(1000, 2000); + + /* write all alert to masked */ + ret = mt6360_tcpc_write16(regmap, TCPC_ALERT_MASK, 0); + if (ret) + return ret; + + /* config I2C timeout reset enable , and timeout to 200ms */ + ret = regmap_write(regmap, MT6360_REG_I2CTORST, 0x8F); + if (ret) + return ret; + + /* config CC Detect Debounce : 26.7*val us */ + ret = regmap_write(regmap, MT6360_REG_DEBCTRL1, 0x10); + if (ret) + return ret; + + /* DRP Toggle Cycle : 51.2 + 6.4*val ms */ + ret = regmap_write(regmap, MT6360_REG_DRPCTRL1, 4); + if (ret) + return ret; + + /* DRP Duyt Ctrl : dcSRC: /1024 */ + ret = mt6360_tcpc_write16(regmap, MT6360_REG_DRPCTRL2, 330); + if (ret) + return ret; + + /* Enable VCONN Current Limit function */ + ret = regmap_update_bits(regmap, MT6360_REG_VCONNCTRL1, MT6360_VCONNCL_ENABLE, + MT6360_VCONNCL_ENABLE); + if (ret) + return ret; + + /* Enable cc open 40ms when pmic send vsysuv signal */ + ret = regmap_update_bits(regmap, MT6360_REG_RXCTRL2, MT6360_OPEN40M_ENABLE, + MT6360_OPEN40M_ENABLE); + if (ret) + return ret; + + /* Enable Rpdet oneshot detection */ + ret = regmap_update_bits(regmap, MT6360_REG_CTDCTRL2, MT6360_RPONESHOT_ENABLE, + MT6360_RPONESHOT_ENABLE); + if (ret) + return ret; + + /* Set shipping mode off, AUTOIDLE on */ + return regmap_write(regmap, MT6360_REG_MODECTRL2, 0x7A); +} + +static irqreturn_t mt6360_irq(int irq, void *dev_id) +{ + struct mt6360_tcpc_info *mti = dev_id; + + return tcpci_irq(mti->tcpci); +} + +static int mt6360_tcpc_probe(struct platform_device *pdev) +{ + struct mt6360_tcpc_info *mti; + int ret; + + mti = devm_kzalloc(&pdev->dev, sizeof(*mti), GFP_KERNEL); + if (!mti) + return -ENOMEM; + + mti->dev = &pdev->dev; + + mti->tdata.regmap = dev_get_regmap(pdev->dev.parent, NULL); + if (!mti->tdata.regmap) { + dev_err(&pdev->dev, "Failed to get parent regmap\n"); + return -ENODEV; + } + + mti->irq = platform_get_irq_byname(pdev, "PD_IRQB"); + if (mti->irq < 0) + return mti->irq; + + mti->tdata.init = mt6360_tcpc_init; + mti->tcpci = tcpci_register_port(&pdev->dev, &mti->tdata); + if (IS_ERR(mti->tcpci)) { + dev_err(&pdev->dev, "Failed to register tcpci port\n"); + return PTR_ERR(mti->tcpci); + } + + ret = devm_request_threaded_irq(mti->dev, mti->irq, NULL, mt6360_irq, IRQF_ONESHOT, + dev_name(&pdev->dev), mti); + if (ret) { + dev_err(mti->dev, "Failed to register irq\n"); + tcpci_unregister_port(mti->tcpci); + return ret; + } + + device_init_wakeup(&pdev->dev, true); + platform_set_drvdata(pdev, mti); + + return 0; +} + +static int mt6360_tcpc_remove(struct platform_device *pdev) +{ + struct mt6360_tcpc_info *mti = platform_get_drvdata(pdev); + + disable_irq(mti->irq); + tcpci_unregister_port(mti->tcpci); + return 0; +} + +static int __maybe_unused mt6360_tcpc_suspend(struct device *dev) +{ + struct mt6360_tcpc_info *mti = dev_get_drvdata(dev); + + if (device_may_wakeup(dev)) + enable_irq_wake(mti->irq); + + return 0; +} + +static int __maybe_unused mt6360_tcpc_resume(struct device *dev) +{ + struct mt6360_tcpc_info *mti = dev_get_drvdata(dev); + + if (device_may_wakeup(dev)) + disable_irq_wake(mti->irq); + + return 0; +} + +static SIMPLE_DEV_PM_OPS(mt6360_tcpc_pm_ops, mt6360_tcpc_suspend, mt6360_tcpc_resume); + +static const struct of_device_id __maybe_unused mt6360_tcpc_of_id[] = { + { .compatible = "mediatek,mt6360-tcpc", }, + {}, +}; +MODULE_DEVICE_TABLE(of, mt6360_tcpc_of_id); + +static struct platform_driver mt6360_tcpc_driver = { + .driver = { + .name = "mt6360-tcpc", + .pm = &mt6360_tcpc_pm_ops, + .of_match_table = mt6360_tcpc_of_id, + }, + .probe = mt6360_tcpc_probe, + .remove = mt6360_tcpc_remove, +}; +module_platform_driver(mt6360_tcpc_driver); + +MODULE_AUTHOR("ChiYuan Huang "); +MODULE_DESCRIPTION("MT6360 USB Type-C Port Controller Interface Driver"); +MODULE_LICENSE("GPL v2"); From patchwork Thu Aug 27 11:18:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cy_huang X-Patchwork-Id: 258747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFB2BC433E3 for ; Thu, 27 Aug 2020 15:21:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0B782080C for ; Thu, 27 Aug 2020 15:21:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iP5GfH4B" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727790AbgH0PV0 (ORCPT ); Thu, 27 Aug 2020 11:21:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728694AbgH0LcR (ORCPT ); Thu, 27 Aug 2020 07:32:17 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87D32C061239; Thu, 27 Aug 2020 04:19:21 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id i10so3140655pgk.1; Thu, 27 Aug 2020 04:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4AB77AAFgWkjOgI8rZNbI2/uf+Pa/WR+XiSoAO41hDU=; b=iP5GfH4BYcFn1X7+ZaLSUUP8OFJgPiJ0YXqtbyak2fY+O+dRk8aIeqwW2sg2YIRtbl 4561u6EklbPcqjXB73lkcd2pQPLAD3CpN/1lcFAegHNijNA6O8hmgc/99UPk/y3c3AZU W1qTMcQELkRJHqmgWPBYeW1a6UTbLXPCoDAyZ91PMUaDIX9WvdYuKDixpDbwlIoN/dBS baEwyQUGHCgraS23lIENCgkLA0/MJId5x4FySBjmpZJ+7iPPADXbOMdygwgwFStGaHQV 5FzIhc84ICzEuV8M8zoBBZDl7GOE9sJIupMYO8i7/Uotr1/3YJHWYIGGjRqpRCE20hUO dU5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4AB77AAFgWkjOgI8rZNbI2/uf+Pa/WR+XiSoAO41hDU=; b=Onc1kEN1ZoHUszqdIV8WmXay7GcSNkxI0XPWuAqqZmvEB0L/yjAVtPbEG9J7cwaDef 1DrwGrVR3dkx3Sw6ZKF72ofA6LNLlQ7IYDtne9Hj/LFr1xK12i3VG2iZXtfrreiluPgP 8zB5dCIWnCgoWbSJzX65UcOYarAHvCzZRmIzBo/1DiHswOXKRb9NHUkW2hAJwCHnKMvP 8/i0ev2IgPpA82Urwd/ur3sc5VDUW8YL7gJZ7MY1X0vXI0e0S9HSV490En45+n0B7EFo b1NiEOyvB+hHYA2+WhtncU8Sv/RzISt3HQVQU3IQrmSCWuJoza2aElgV25DQj966xgC4 cIXw== X-Gm-Message-State: AOAM5328PiSHT3NMOHUU6bUmsUJCsDSFZ44GtvLGG4AQhImYjPnKv1PG R0VUdG7Q/vL+358bJUs6ZVo= X-Google-Smtp-Source: ABdhPJyS8KU9UqgkcpP9lUUeYiVT5tWm/4YdrdCIIWqlJ0PCb4r7qs1JbjY/8l3wZGSH7qp0kRqejw== X-Received: by 2002:a17:902:7045:: with SMTP id h5mr5664144plt.4.1598527160923; Thu, 27 Aug 2020 04:19:20 -0700 (PDT) Received: from localhost.localdomain ([2402:7500:46b:c678:1129:dc1b:b8d8:6430]) by smtp.gmail.com with ESMTPSA id h64sm2411609pfe.201.2020.08.27.04.19.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 04:19:20 -0700 (PDT) From: cy_huang To: gregkh@linuxfoundation.org, robh+dt@kernel.org, matthias.bgg@gmail.com, linux@roeck-us.net, heikki.krogerus@linux.intel.com Cc: cy_huang@richtek.com, gene_chen@richtek.com, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] usb typec: mt6360: Rename driver/Kconfig/Makefile from mt6360 to mt636x Date: Thu, 27 Aug 2020 19:18:56 +0800 Message-Id: <1598527137-6915-2-git-send-email-u0084500@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1598527137-6915-1-git-send-email-u0084500@gmail.com> References: <1598527137-6915-1-git-send-email-u0084500@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: ChiYuan Huang 1. Rename file form tcpci_mt6360.c to tcpci_mt636x.c 2. Rename internal function from mt6360 to mt636x, except the register definition. 3. Change Kconfig/Makefile from MT6360 to MT636X. Signed-off-by: ChiYuan Huang --- drivers/usb/typec/tcpm/Kconfig | 6 +- drivers/usb/typec/tcpm/Makefile | 2 +- drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ---------------------------------- drivers/usb/typec/tcpm/tcpci_mt636x.c | 212 ++++++++++++++++++++++++++++++++++ 4 files changed, 216 insertions(+), 216 deletions(-) delete mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.c create mode 100644 drivers/usb/typec/tcpm/tcpci_mt636x.c diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig index 58a64e1..c96141f 100644 --- a/drivers/usb/typec/tcpm/Kconfig +++ b/drivers/usb/typec/tcpm/Kconfig @@ -27,11 +27,11 @@ config TYPEC_RT1711H Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities. -config TYPEC_MT6360 - tristate "Mediatek MT6360 Type-C driver" +config TYPEC_MT636X + tristate "Mediatek MT636x Type-C driver" depends on MFD_MT6360 help - Mediatek MT6360 is a multi-functional IC that includes + Mediatek MT636x is a multi-functional IC that includes USB Type-C. It works with Type-C Port Controller Manager to provide USB PD and USB Type-C functionalities. diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile index 7592ccb..ccd7923 100644 --- a/drivers/usb/typec/tcpm/Makefile +++ b/drivers/usb/typec/tcpm/Makefile @@ -5,4 +5,4 @@ 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 -obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.o +obj-$(CONFIG_TYPEC_MT636X) += tcpci_mt636x.o diff --git a/drivers/usb/typec/tcpm/tcpci_mt6360.c b/drivers/usb/typec/tcpm/tcpci_mt6360.c deleted file mode 100644 index f1bd9e0..00000000 --- a/drivers/usb/typec/tcpm/tcpci_mt6360.c +++ /dev/null @@ -1,212 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (C) 2020 MediaTek Inc. - * - * Author: ChiYuan Huang - */ - -#include -#include -#include -#include -#include -#include -#include - -#include "tcpci.h" - -#define MT6360_REG_VCONNCTRL1 0x8C -#define MT6360_REG_MODECTRL2 0x8F -#define MT6360_REG_SWRESET 0xA0 -#define MT6360_REG_DEBCTRL1 0xA1 -#define MT6360_REG_DRPCTRL1 0xA2 -#define MT6360_REG_DRPCTRL2 0xA3 -#define MT6360_REG_I2CTORST 0xBF -#define MT6360_REG_RXCTRL2 0xCF -#define MT6360_REG_CTDCTRL2 0xEC - -/* MT6360_REG_VCONNCTRL1 */ -#define MT6360_VCONNCL_ENABLE BIT(0) -/* MT6360_REG_RXCTRL2 */ -#define MT6360_OPEN40M_ENABLE BIT(7) -/* MT6360_REG_CTDCTRL2 */ -#define MT6360_RPONESHOT_ENABLE BIT(6) - -struct mt6360_tcpc_info { - struct tcpci_data tdata; - struct tcpci *tcpci; - struct device *dev; - int irq; -}; - -static inline int mt6360_tcpc_read16(struct regmap *regmap, - unsigned int reg, u16 *val) -{ - return regmap_raw_read(regmap, reg, val, sizeof(u16)); -} - -static inline int mt6360_tcpc_write16(struct regmap *regmap, - unsigned int reg, u16 val) -{ - return regmap_raw_write(regmap, reg, &val, sizeof(u16)); -} - -static int mt6360_tcpc_init(struct tcpci *tcpci, struct tcpci_data *tdata) -{ - struct regmap *regmap = tdata->regmap; - int ret; - - ret = regmap_write(regmap, MT6360_REG_SWRESET, 0x01); - if (ret) - return ret; - - /* after reset command, wait 1~2ms to wait IC action */ - usleep_range(1000, 2000); - - /* write all alert to masked */ - ret = mt6360_tcpc_write16(regmap, TCPC_ALERT_MASK, 0); - if (ret) - return ret; - - /* config I2C timeout reset enable , and timeout to 200ms */ - ret = regmap_write(regmap, MT6360_REG_I2CTORST, 0x8F); - if (ret) - return ret; - - /* config CC Detect Debounce : 26.7*val us */ - ret = regmap_write(regmap, MT6360_REG_DEBCTRL1, 0x10); - if (ret) - return ret; - - /* DRP Toggle Cycle : 51.2 + 6.4*val ms */ - ret = regmap_write(regmap, MT6360_REG_DRPCTRL1, 4); - if (ret) - return ret; - - /* DRP Duyt Ctrl : dcSRC: /1024 */ - ret = mt6360_tcpc_write16(regmap, MT6360_REG_DRPCTRL2, 330); - if (ret) - return ret; - - /* Enable VCONN Current Limit function */ - ret = regmap_update_bits(regmap, MT6360_REG_VCONNCTRL1, MT6360_VCONNCL_ENABLE, - MT6360_VCONNCL_ENABLE); - if (ret) - return ret; - - /* Enable cc open 40ms when pmic send vsysuv signal */ - ret = regmap_update_bits(regmap, MT6360_REG_RXCTRL2, MT6360_OPEN40M_ENABLE, - MT6360_OPEN40M_ENABLE); - if (ret) - return ret; - - /* Enable Rpdet oneshot detection */ - ret = regmap_update_bits(regmap, MT6360_REG_CTDCTRL2, MT6360_RPONESHOT_ENABLE, - MT6360_RPONESHOT_ENABLE); - if (ret) - return ret; - - /* Set shipping mode off, AUTOIDLE on */ - return regmap_write(regmap, MT6360_REG_MODECTRL2, 0x7A); -} - -static irqreturn_t mt6360_irq(int irq, void *dev_id) -{ - struct mt6360_tcpc_info *mti = dev_id; - - return tcpci_irq(mti->tcpci); -} - -static int mt6360_tcpc_probe(struct platform_device *pdev) -{ - struct mt6360_tcpc_info *mti; - int ret; - - mti = devm_kzalloc(&pdev->dev, sizeof(*mti), GFP_KERNEL); - if (!mti) - return -ENOMEM; - - mti->dev = &pdev->dev; - - mti->tdata.regmap = dev_get_regmap(pdev->dev.parent, NULL); - if (!mti->tdata.regmap) { - dev_err(&pdev->dev, "Failed to get parent regmap\n"); - return -ENODEV; - } - - mti->irq = platform_get_irq_byname(pdev, "PD_IRQB"); - if (mti->irq < 0) - return mti->irq; - - mti->tdata.init = mt6360_tcpc_init; - mti->tcpci = tcpci_register_port(&pdev->dev, &mti->tdata); - if (IS_ERR(mti->tcpci)) { - dev_err(&pdev->dev, "Failed to register tcpci port\n"); - return PTR_ERR(mti->tcpci); - } - - ret = devm_request_threaded_irq(mti->dev, mti->irq, NULL, mt6360_irq, IRQF_ONESHOT, - dev_name(&pdev->dev), mti); - if (ret) { - dev_err(mti->dev, "Failed to register irq\n"); - tcpci_unregister_port(mti->tcpci); - return ret; - } - - device_init_wakeup(&pdev->dev, true); - platform_set_drvdata(pdev, mti); - - return 0; -} - -static int mt6360_tcpc_remove(struct platform_device *pdev) -{ - struct mt6360_tcpc_info *mti = platform_get_drvdata(pdev); - - disable_irq(mti->irq); - tcpci_unregister_port(mti->tcpci); - return 0; -} - -static int __maybe_unused mt6360_tcpc_suspend(struct device *dev) -{ - struct mt6360_tcpc_info *mti = dev_get_drvdata(dev); - - if (device_may_wakeup(dev)) - enable_irq_wake(mti->irq); - - return 0; -} - -static int __maybe_unused mt6360_tcpc_resume(struct device *dev) -{ - struct mt6360_tcpc_info *mti = dev_get_drvdata(dev); - - if (device_may_wakeup(dev)) - disable_irq_wake(mti->irq); - - return 0; -} - -static SIMPLE_DEV_PM_OPS(mt6360_tcpc_pm_ops, mt6360_tcpc_suspend, mt6360_tcpc_resume); - -static const struct of_device_id __maybe_unused mt6360_tcpc_of_id[] = { - { .compatible = "mediatek,mt6360-tcpc", }, - {}, -}; -MODULE_DEVICE_TABLE(of, mt6360_tcpc_of_id); - -static struct platform_driver mt6360_tcpc_driver = { - .driver = { - .name = "mt6360-tcpc", - .pm = &mt6360_tcpc_pm_ops, - .of_match_table = mt6360_tcpc_of_id, - }, - .probe = mt6360_tcpc_probe, - .remove = mt6360_tcpc_remove, -}; -module_platform_driver(mt6360_tcpc_driver); - -MODULE_AUTHOR("ChiYuan Huang "); -MODULE_DESCRIPTION("MT6360 USB Type-C Port Controller Interface Driver"); -MODULE_LICENSE("GPL v2"); diff --git a/drivers/usb/typec/tcpm/tcpci_mt636x.c b/drivers/usb/typec/tcpm/tcpci_mt636x.c new file mode 100644 index 00000000..ca0f743 --- /dev/null +++ b/drivers/usb/typec/tcpm/tcpci_mt636x.c @@ -0,0 +1,212 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2020 MediaTek Inc. + * + * Author: ChiYuan Huang + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "tcpci.h" + +#define MT6360_REG_VCONNCTRL1 0x8C +#define MT6360_REG_MODECTRL2 0x8F +#define MT6360_REG_SWRESET 0xA0 +#define MT6360_REG_DEBCTRL1 0xA1 +#define MT6360_REG_DRPCTRL1 0xA2 +#define MT6360_REG_DRPCTRL2 0xA3 +#define MT6360_REG_I2CTORST 0xBF +#define MT6360_REG_RXCTRL2 0xCF +#define MT6360_REG_CTDCTRL2 0xEC + +/* MT6360_REG_VCONNCTRL1 */ +#define MT6360_VCONNCL_ENABLE BIT(0) +/* MT6360_REG_RXCTRL2 */ +#define MT6360_OPEN40M_ENABLE BIT(7) +/* MT6360_REG_CTDCTRL2 */ +#define MT6360_RPONESHOT_ENABLE BIT(6) + +struct mt636x_tcpc_info { + struct tcpci_data tdata; + struct tcpci *tcpci; + struct device *dev; + int irq; +}; + +static inline int mt636x_tcpc_read16(struct regmap *regmap, + unsigned int reg, u16 *val) +{ + return regmap_raw_read(regmap, reg, val, sizeof(u16)); +} + +static inline int mt636x_tcpc_write16(struct regmap *regmap, + unsigned int reg, u16 val) +{ + return regmap_raw_write(regmap, reg, &val, sizeof(u16)); +} + +static int mt636x_tcpc_init(struct tcpci *tcpci, struct tcpci_data *tdata) +{ + struct regmap *regmap = tdata->regmap; + int ret; + + ret = regmap_write(regmap, MT6360_REG_SWRESET, 0x01); + if (ret) + return ret; + + /* after reset command, wait 1~2ms to wait IC action */ + usleep_range(1000, 2000); + + /* write all alert to masked */ + ret = mt636x_tcpc_write16(regmap, TCPC_ALERT_MASK, 0); + if (ret) + return ret; + + /* config I2C timeout reset enable , and timeout to 200ms */ + ret = regmap_write(regmap, MT6360_REG_I2CTORST, 0x8F); + if (ret) + return ret; + + /* config CC Detect Debounce : 26.7*val us */ + ret = regmap_write(regmap, MT6360_REG_DEBCTRL1, 0x10); + if (ret) + return ret; + + /* DRP Toggle Cycle : 51.2 + 6.4*val ms */ + ret = regmap_write(regmap, MT6360_REG_DRPCTRL1, 4); + if (ret) + return ret; + + /* DRP Duyt Ctrl : dcSRC: /1024 */ + ret = mt636x_tcpc_write16(regmap, MT6360_REG_DRPCTRL2, 330); + if (ret) + return ret; + + /* Enable VCONN Current Limit function */ + ret = regmap_update_bits(regmap, MT6360_REG_VCONNCTRL1, MT6360_VCONNCL_ENABLE, + MT6360_VCONNCL_ENABLE); + if (ret) + return ret; + + /* Enable cc open 40ms when pmic send vsysuv signal */ + ret = regmap_update_bits(regmap, MT6360_REG_RXCTRL2, MT6360_OPEN40M_ENABLE, + MT6360_OPEN40M_ENABLE); + if (ret) + return ret; + + /* Enable Rpdet oneshot detection */ + ret = regmap_update_bits(regmap, MT6360_REG_CTDCTRL2, MT6360_RPONESHOT_ENABLE, + MT6360_RPONESHOT_ENABLE); + if (ret) + return ret; + + /* Set shipping mode off, AUTOIDLE on */ + return regmap_write(regmap, MT6360_REG_MODECTRL2, 0x7A); +} + +static irqreturn_t mt636x_irq(int irq, void *dev_id) +{ + struct mt636x_tcpc_info *mti = dev_id; + + return tcpci_irq(mti->tcpci); +} + +static int mt636x_tcpc_probe(struct platform_device *pdev) +{ + struct mt636x_tcpc_info *mti; + int ret; + + mti = devm_kzalloc(&pdev->dev, sizeof(*mti), GFP_KERNEL); + if (!mti) + return -ENOMEM; + + mti->dev = &pdev->dev; + + mti->tdata.regmap = dev_get_regmap(pdev->dev.parent, NULL); + if (!mti->tdata.regmap) { + dev_err(&pdev->dev, "Failed to get parent regmap\n"); + return -ENODEV; + } + + mti->irq = platform_get_irq_byname(pdev, "PD_IRQB"); + if (mti->irq < 0) + return mti->irq; + + mti->tdata.init = mt636x_tcpc_init; + mti->tcpci = tcpci_register_port(&pdev->dev, &mti->tdata); + if (IS_ERR(mti->tcpci)) { + dev_err(&pdev->dev, "Failed to register tcpci port\n"); + return PTR_ERR(mti->tcpci); + } + + ret = devm_request_threaded_irq(mti->dev, mti->irq, NULL, mt636x_irq, IRQF_ONESHOT, + dev_name(&pdev->dev), mti); + if (ret) { + dev_err(mti->dev, "Failed to register irq\n"); + tcpci_unregister_port(mti->tcpci); + return ret; + } + + device_init_wakeup(&pdev->dev, true); + platform_set_drvdata(pdev, mti); + + return 0; +} + +static int mt636x_tcpc_remove(struct platform_device *pdev) +{ + struct mt636x_tcpc_info *mti = platform_get_drvdata(pdev); + + disable_irq(mti->irq); + tcpci_unregister_port(mti->tcpci); + return 0; +} + +static int __maybe_unused mt636x_tcpc_suspend(struct device *dev) +{ + struct mt636x_tcpc_info *mti = dev_get_drvdata(dev); + + if (device_may_wakeup(dev)) + enable_irq_wake(mti->irq); + + return 0; +} + +static int __maybe_unused mt636x_tcpc_resume(struct device *dev) +{ + struct mt636x_tcpc_info *mti = dev_get_drvdata(dev); + + if (device_may_wakeup(dev)) + disable_irq_wake(mti->irq); + + return 0; +} + +static SIMPLE_DEV_PM_OPS(mt636x_tcpc_pm_ops, mt636x_tcpc_suspend, mt636x_tcpc_resume); + +static const struct of_device_id __maybe_unused mt636x_tcpc_of_id[] = { + { .compatible = "mediatek,mt6360-tcpc", }, + {}, +}; +MODULE_DEVICE_TABLE(of, mt636x_tcpc_of_id); + +static struct platform_driver mt636x_tcpc_driver = { + .driver = { + .name = "mt636x-tcpc", + .pm = &mt636x_tcpc_pm_ops, + .of_match_table = mt636x_tcpc_of_id, + }, + .probe = mt636x_tcpc_probe, + .remove = mt636x_tcpc_remove, +}; +module_platform_driver(mt636x_tcpc_driver); + +MODULE_AUTHOR("ChiYuan Huang "); +MODULE_DESCRIPTION("MT636x USB Type-C Port Controller Interface Driver"); +MODULE_LICENSE("GPL v2");