Linux-ARM-MSM Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Boyd <sboyd@kernel.org>
To: Wesley Cheng <wcheng@codeaurora.org>,
	agross@kernel.org, bjorn.andersson@linaro.org,
	gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com,
	robh+dt@kernel.org
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
	jackp@codeaurora.org, Wesley Cheng <wcheng@codeaurora.org>
Subject: Re: [PATCH v6 1/4] usb: typec: Add QCOM PMIC typec detection driver
Date: Wed, 29 Jul 2020 01:33:29 -0700
Message-ID: <159601160976.1360974.10172804658083744292@swboyd.mtv.corp.google.com> (raw)
In-Reply-To: <20200729071340.7673-2-wcheng@codeaurora.org>

Quoting Wesley Cheng (2020-07-29 00:13:37)
> diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
> index 559dd06117e7..3e375f82849d 100644
> --- a/drivers/usb/typec/Kconfig
> +++ b/drivers/usb/typec/Kconfig
> @@ -73,6 +73,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

Can you add || COMPILE_TEST here?

> +       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/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 <linux/err.h>
> +#include <linux/regmap.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/slab.h>
> +#include <linux/interrupt.h>
> +#include <linux/of_irq.h>

Is this include used?

> +#include <linux/platform_device.h>
> +#include <linux/of_device.h>

Is this include used?

> +#include <linux/usb/role.h>
> +#include <linux/usb/typec_mux.h>
> +#include <linux/regulator/consumer.h>
> +
> +#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;

Please don't assign and then reassign before testing this variable.

> +
> +       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) ?

Do we really need to shift >> by 1? Seems useless for a test.

> +                               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", &reg);
> +       if (ret < 0) {
> +               dev_err(dev, "missing base address");

Please add newlines at the end of printk messages.

> +               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");

platform_get_irq() already prints an error message. Please remove this.

> +               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" },
> +       { },

Nitpick: Drop the comma here so nothing can come after without causing a
compile error.

> +};
> +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,
> +};
> +

Another nitpick: Drop the newline and make module_platform_driver()
follow directly after the driver.

> +module_platform_driver(qcom_pmic_typec);
> +
> +MODULE_DESCRIPTION("QCOM PMIC USB type C driver");
> +MODULE_LICENSE("GPL v2");

  reply index

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-29  7:13 [PATCH v6 0/4] Introduce PMIC based USB type C detection Wesley Cheng
2020-07-29  7:13 ` [PATCH v6 1/4] usb: typec: Add QCOM PMIC typec detection driver Wesley Cheng
2020-07-29  8:33   ` Stephen Boyd [this message]
2020-07-31 23:31     ` Wesley Cheng
2020-07-29  7:13 ` [PATCH v6 2/4] dt-bindings: usb: Add Qualcomm PMIC type C controller dt-binding Wesley Cheng
2020-07-29  7:13 ` [PATCH v6 3/4] arm64: boot: dts: qcom: pm8150b: Add node for USB type C block Wesley Cheng
2020-07-29  7:13 ` [PATCH v6 4/4] arm64: boot: dts: qcom: pm8150b: Add DTS node for PMIC VBUS booster Wesley Cheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=159601160976.1360974.10172804658083744292@swboyd.mtv.corp.google.com \
    --to=sboyd@kernel.org \
    --cc=agross@kernel.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=jackp@codeaurora.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=wcheng@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-ARM-MSM Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-msm/0 linux-arm-msm/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-msm linux-arm-msm/ https://lore.kernel.org/linux-arm-msm \
		linux-arm-msm@vger.kernel.org
	public-inbox-index linux-arm-msm

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-arm-msm


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git