Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2971655ybt; Mon, 29 Jun 2020 11:48:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzP85yHn9fNQbHwIuUgOyyq56h5WzFHe2vCBSXlSu8ljCgzcS5VML7smfdkPv660ubhpYAM X-Received: by 2002:aa7:d9c7:: with SMTP id v7mr14722560eds.36.1593456509325; Mon, 29 Jun 2020 11:48:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593456509; cv=none; d=google.com; s=arc-20160816; b=nRxSg/MojsdDzptCnAneIp5/+Dr/UHMUriBIeXttESXPQ4B6MQ2K/bJPsQhoJFWtkV Pt+czQz76xqehkGXiZKx8LOvhk1GkLTz6VS8J1yCT0HHiDcZZ2Ubndu1ze1f+8++IarD afKPyZhwWtDJKCVt6c6u64LFDyxHjKJYli1hAOUWcv1aPaiOOq2U8jsSXs/qc+BrzAxX 80hG3IhwhI8IuxYogh8V/pBkPmC7uEt7aHBegyjHQJuV6z86DBjA7+HpH28HXy4uwsmR EOgqvXNhcSLoAaglHw7EF4vGSVeAlU2FRkwLZWs5eM9CI0sLBsnCpGcq4eU2ZT57pdgF gx3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :ironport-sdr:ironport-sdr; bh=eTafa/24k/qpbza834l472LXDnb0KYiYKmUjg0Kkl+E=; b=QedydnEInQYj4LfEYlJcaXAYVe/ZzJekzEB1VrHDbt4U07MLeErsBZbHD8qUKw2E8+ E/vbPqWB3KC4oMgy5zjdVS1aKfrWzDG1x6UJl0pbHeiXJCnGuT5Qb51G2ITNI6Fw7siX l2MHixdiyUPqBJJMBC8s4/u3cgHbOh+Mj2CciGY3r/oocJX/O3Eel7Q9M/8n/PQT7gIC 2rlO8uN6M4qqTDG9ZpTDSCASTY+yBCcWNN4n7ArLa1oKBTg4HTTDcEKXLgOK/Gp6e02C QHVNQM194QP/ypJpGxMXeyQNzvfP+1tEOD3QI/DGC898/ytTpCyit41HU8S8MKdvX92a /FAA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id be27si233947edb.50.2020.06.29.11.48.05; Mon, 29 Jun 2020 11:48:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728139AbgF2SqC (ORCPT + 99 others); Mon, 29 Jun 2020 14:46:02 -0400 Received: from mga02.intel.com ([134.134.136.20]:40916 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728088AbgF2Sn6 (ORCPT ); Mon, 29 Jun 2020 14:43:58 -0400 IronPort-SDR: vbJ+wb12l2XX+Uk8XxHQwhDRmdRW3cC81sEATNtnI0WauT3+X980ap4F/7sp5YmcYEVVqPwN6p zB7FD8f2ubLw== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="134238586" X-IronPort-AV: E=Sophos;i="5.75,294,1589266800"; d="scan'208";a="134238586" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2020 00:22:12 -0700 IronPort-SDR: IK2B93vrGxkOX3auaaON3OXDiOil8mKogsFsuQ/9caFcYPW5aDAI8cfqTDzf6d5lchEqEI53Ly joke4krAoRFw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,294,1589266800"; d="scan'208";a="386316237" Received: from kuha.fi.intel.com ([10.237.72.162]) by fmsmga001.fm.intel.com with SMTP; 29 Jun 2020 00:22:03 -0700 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Mon, 29 Jun 2020 10:22:02 +0300 Date: Mon, 29 Jun 2020 10:22:02 +0300 From: Heikki Krogerus To: Wesley Cheng Cc: agross@kernel.org, mark.rutland@arm.com, bjorn.andersson@linaro.org, gregkh@linuxfoundation.org, broonie@kernel.org, lgirdwood@gmail.com, robh+dt@kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, jackp@codeaurora.org, rdunlap@infradead.org Subject: Re: [PATCH v4 1/6] usb: typec: Add QCOM PMIC typec detection driver Message-ID: <20200629072202.GA856968@kuha.fi.intel.com> References: <20200626185516.18018-1-wcheng@codeaurora.org> <20200626185516.18018-2-wcheng@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200626185516.18018-2-wcheng@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 26, 2020 at 11:55:11AM -0700, Wesley Cheng wrote: > The QCOM SPMI typec driver handles the role and orientation detection, and > notifies client drivers using the USB role switch framework. It registers > as a typec port, so orientation can be communicated using the typec switch > APIs. The driver also attains a handle to the VBUS output regulator, so it > can enable/disable the VBUS source when acting as a host/device. > > Signed-off-by: Wesley Cheng Acked-by: Heikki Krogerus > --- > drivers/usb/typec/Kconfig | 12 ++ > drivers/usb/typec/Makefile | 1 + > drivers/usb/typec/qcom-pmic-typec.c | 275 ++++++++++++++++++++++++++++ > 3 files changed, 288 insertions(+) > create mode 100644 drivers/usb/typec/qcom-pmic-typec.c > > diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig > index b4f2aac7ae8a..595c14766e99 100644 > --- a/drivers/usb/typec/Kconfig > +++ b/drivers/usb/typec/Kconfig > @@ -72,6 +72,18 @@ config TYPEC_TPS6598X > If you choose to build this driver as a dynamically linked module, the > module will be called tps6598x.ko. > > +config TYPEC_QCOM_PMIC > + tristate "Qualcomm PMIC USB Type-C driver" > + depends on ARCH_QCOM > + help > + Driver for supporting role switch over the Qualcomm PMIC. This will > + handle the USB Type-C role and orientation detection reported by the > + QCOM PMIC if the PMIC has the capability to handle USB Type-C > + detection. > + > + It will also enable the VBUS output to connected devices when a > + DFP connection is made. > + > source "drivers/usb/typec/mux/Kconfig" > > source "drivers/usb/typec/altmodes/Kconfig" > diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile > index 7753a5c3cd46..cceffd987643 100644 > --- a/drivers/usb/typec/Makefile > +++ b/drivers/usb/typec/Makefile > @@ -6,4 +6,5 @@ obj-$(CONFIG_TYPEC_TCPM) += tcpm/ > obj-$(CONFIG_TYPEC_UCSI) += ucsi/ > obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o > obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o > +obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom-pmic-typec.o > obj-$(CONFIG_TYPEC) += mux/ > diff --git a/drivers/usb/typec/qcom-pmic-typec.c b/drivers/usb/typec/qcom-pmic-typec.c > new file mode 100644 > index 000000000000..5ae3af03c638 > --- /dev/null > +++ b/drivers/usb/typec/qcom-pmic-typec.c > @@ -0,0 +1,275 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2020, The Linux Foundation. All rights reserved. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define TYPEC_MISC_STATUS 0xb > +#define CC_ATTACHED BIT(0) > +#define CC_ORIENTATION BIT(1) > +#define SNK_SRC_MODE BIT(6) > +#define TYPEC_MODE_CFG 0x44 > +#define TYPEC_DISABLE_CMD BIT(0) > +#define EN_SNK_ONLY BIT(1) > +#define EN_SRC_ONLY BIT(2) > +#define TYPEC_VCONN_CONTROL 0x46 > +#define VCONN_EN_SRC BIT(0) > +#define VCONN_EN_VAL BIT(1) > +#define TYPEC_EXIT_STATE_CFG 0x50 > +#define SEL_SRC_UPPER_REF BIT(2) > +#define TYPEC_INTR_EN_CFG_1 0x5e > +#define TYPEC_INTR_EN_CFG_1_MASK GENMASK(7, 0) > + > +struct qcom_pmic_typec { > + struct device *dev; > + struct fwnode_handle *fwnode; > + struct regmap *regmap; > + u32 base; > + > + struct typec_capability *cap; > + struct typec_port *port; > + struct usb_role_switch *role_sw; > + > + struct regulator *vbus_reg; > + bool vbus_enabled; > +}; > + > +static void qcom_pmic_typec_enable_vbus_regulator(struct qcom_pmic_typec > + *qcom_usb, bool enable) > +{ > + int ret = 0; > + > + if (enable == qcom_usb->vbus_enabled) > + return; > + > + if (!qcom_usb->vbus_reg) { > + qcom_usb->vbus_reg = devm_regulator_get(qcom_usb->dev, > + "usb_vbus"); > + if (IS_ERR(qcom_usb->vbus_reg)) { > + qcom_usb->vbus_reg = NULL; > + return; > + } > + } > + > + if (enable) { > + ret = regulator_enable(qcom_usb->vbus_reg); > + if (ret) > + return; > + } else { > + ret = regulator_disable(qcom_usb->vbus_reg); > + if (ret) > + return; > + } > + qcom_usb->vbus_enabled = enable; > +} > + > +static void qcom_pmic_typec_check_connection(struct qcom_pmic_typec *qcom_usb) > +{ > + enum typec_orientation orientation; > + enum usb_role role; > + unsigned int stat; > + bool enable_vbus; > + > + regmap_read(qcom_usb->regmap, qcom_usb->base + TYPEC_MISC_STATUS, > + &stat); > + > + if (stat & CC_ATTACHED) { > + orientation = ((stat & CC_ORIENTATION) >> 1) ? > + TYPEC_ORIENTATION_REVERSE : > + TYPEC_ORIENTATION_NORMAL; > + typec_set_orientation(qcom_usb->port, orientation); > + > + role = (stat & SNK_SRC_MODE) ? USB_ROLE_HOST : USB_ROLE_DEVICE; > + if (role == USB_ROLE_HOST) > + enable_vbus = true; > + else > + enable_vbus = false; > + } else { > + role = USB_ROLE_NONE; > + enable_vbus = false; > + } > + > + qcom_pmic_typec_enable_vbus_regulator(qcom_usb, enable_vbus); > + usb_role_switch_set_role(qcom_usb->role_sw, role); > +} > + > +static irqreturn_t qcom_pmic_typec_interrupt(int irq, void *_qcom_usb) > +{ > + struct qcom_pmic_typec *qcom_usb = _qcom_usb; > + > + qcom_pmic_typec_check_connection(qcom_usb); > + return IRQ_HANDLED; > +} > + > +static void qcom_pmic_typec_typec_hw_init(struct qcom_pmic_typec *qcom_usb) > +{ > + u8 mode = 0; > + > + regmap_update_bits(qcom_usb->regmap, > + qcom_usb->base + TYPEC_INTR_EN_CFG_1, > + TYPEC_INTR_EN_CFG_1_MASK, 0); > + > + if (qcom_usb->cap->type != TYPEC_PORT_DRP) > + mode = (qcom_usb->cap->type == TYPEC_PORT_SNK) ? > + EN_SNK_ONLY : EN_SRC_ONLY; > + regmap_update_bits(qcom_usb->regmap, qcom_usb->base + TYPEC_MODE_CFG, > + EN_SNK_ONLY | EN_SRC_ONLY, mode); > + > + regmap_update_bits(qcom_usb->regmap, > + qcom_usb->base + TYPEC_VCONN_CONTROL, > + VCONN_EN_SRC | VCONN_EN_VAL, VCONN_EN_SRC); > + regmap_update_bits(qcom_usb->regmap, > + qcom_usb->base + TYPEC_EXIT_STATE_CFG, > + SEL_SRC_UPPER_REF, SEL_SRC_UPPER_REF); > +} > + > +static int qcom_pmic_typec_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct qcom_pmic_typec *qcom_usb; > + struct typec_capability *cap; > + const char *buf; > + int ret, irq, role; > + u32 reg; > + > + ret = of_property_read_u32(dev->of_node, "reg", ®); > + if (ret < 0) { > + dev_err(dev, "missing base address"); > + return ret; > + } > + > + qcom_usb = devm_kzalloc(dev, sizeof(*qcom_usb), GFP_KERNEL); > + if (!qcom_usb) > + return -ENOMEM; > + > + qcom_usb->dev = dev; > + qcom_usb->base = reg; > + > + qcom_usb->regmap = dev_get_regmap(dev->parent, NULL); > + if (!qcom_usb->regmap) { > + dev_err(dev, "Failed to get regmap\n"); > + return -EINVAL; > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(dev, "Failed to get CC irq\n"); > + return -EINVAL; > + } > + > + ret = devm_request_threaded_irq(qcom_usb->dev, irq, NULL, > + qcom_pmic_typec_interrupt, IRQF_ONESHOT, > + "qcom-pmic-typec", qcom_usb); > + if (ret) { > + dev_err(&pdev->dev, "Could not request IRQ\n"); > + return ret; > + } > + > + qcom_usb->fwnode = device_get_named_child_node(dev, "connector"); > + if (!qcom_usb->fwnode) > + return -EINVAL; > + > + cap = devm_kzalloc(dev, sizeof(*cap), GFP_KERNEL); > + if (!cap) { > + ret = -ENOMEM; > + goto err_put_node; > + } > + > + ret = fwnode_property_read_string(qcom_usb->fwnode, "power-role", &buf); > + if (!ret) { > + role = typec_find_port_power_role(buf); > + if (role < 0) > + role = TYPEC_PORT_SNK; > + } else { > + role = TYPEC_PORT_SNK; > + } > + cap->type = role; > + > + ret = fwnode_property_read_string(qcom_usb->fwnode, "data-role", &buf); > + if (!ret) { > + role = typec_find_port_data_role(buf); > + if (role < 0) > + role = TYPEC_PORT_UFP; > + } else { > + role = TYPEC_PORT_UFP; > + } > + cap->data = role; > + > + cap->prefer_role = TYPEC_NO_PREFERRED_ROLE; > + cap->fwnode = qcom_usb->fwnode; > + qcom_usb->port = typec_register_port(dev, cap); > + if (IS_ERR(qcom_usb->port)) { > + ret = PTR_ERR(qcom_usb->port); > + dev_err(dev, "Failed to register type c port %d\n", ret); > + goto err_put_node; > + } > + > + qcom_usb->cap = cap; > + > + qcom_usb->role_sw = fwnode_usb_role_switch_get(qcom_usb->fwnode); > + if (IS_ERR(qcom_usb->role_sw)) { > + if (PTR_ERR(qcom_usb->role_sw) != -EPROBE_DEFER) > + dev_err(dev, "failed to get role switch\n"); > + ret = PTR_ERR(qcom_usb->role_sw); > + goto err_typec_port; > + } > + > + platform_set_drvdata(pdev, qcom_usb); > + qcom_pmic_typec_typec_hw_init(qcom_usb); > + qcom_pmic_typec_check_connection(qcom_usb); > + > + return 0; > + > +err_typec_port: > + typec_unregister_port(qcom_usb->port); > +err_put_node: > + fwnode_handle_put(qcom_usb->fwnode); > + > + return ret; > +} > + > +static int qcom_pmic_typec_remove(struct platform_device *pdev) > +{ > + struct qcom_pmic_typec *qcom_usb = platform_get_drvdata(pdev); > + > + usb_role_switch_set_role(qcom_usb->role_sw, USB_ROLE_NONE); > + qcom_pmic_typec_enable_vbus_regulator(qcom_usb, 0); > + > + typec_unregister_port(qcom_usb->port); > + usb_role_switch_put(qcom_usb->role_sw); > + fwnode_handle_put(qcom_usb->fwnode); > + > + return 0; > +} > + > +static const struct of_device_id qcom_pmic_typec_table[] = { > + { .compatible = "qcom,pm8150b-usb-typec" }, > + { }, > +}; > +MODULE_DEVICE_TABLE(of, qcom_pmic_typec_table); > + > +static struct platform_driver qcom_pmic_typec = { > + .driver = { > + .name = "qcom,pmic-typec", > + .of_match_table = qcom_pmic_typec_table, > + }, > + .probe = qcom_pmic_typec_probe, > + .remove = qcom_pmic_typec_remove, > +}; > + > +module_platform_driver(qcom_pmic_typec); > + > +MODULE_DESCRIPTION("QCOM PMIC USB type C driver"); > +MODULE_LICENSE("GPL v2"); > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project thanks, -- heikki