Unverified Commit d5ff5fb9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "Introduce PMIC based USB type C detection" from Wesley Cheng <wcheng@codeaurora.org>: 

Changes in v4:
 - Modified qcom,pmic-typec binding to include the SS mux and the DRD remote
   endpoint nodes underneath port@1, which is assigned to the SSUSB path
   according to usb-connector
 - Added usb-connector reference to the typec dt-binding
 - Added tags to the usb type c and vbus nodes
 - Removed "qcom" tags from type c and vbus nodes
 - Modified Kconfig module name, and removed module alias from the typec driver

Changes in v3:
 - Fix driver reference to match driver name in Kconfig for
   qcom_usb_vbus-regulator.c
 - Utilize regulator bitmap helpers for enable, disable and is enabled calls in
   qcom_usb_vbus-regulator.c
 - Use of_get_regulator_init_data() to initialize regulator init data, and to
   set constraints in qcom_usb_vbus-regulator.c
 - Remove the need for a local device structure in the vbus regulator driver

Changes in v2:
 - Use devm_kzalloc() in qcom_pmic_typec_probe()
 - Add checks to make sure return value of typec_find_port_power_role() is
   valid
 - Added a VBUS output regulator driver, which will be used by the PMIC USB
   type c driver to enable/disable the source
 - Added logic to control vbus source from the PMIC type c driver when
   UFP/DFP is detected
 - Added dt-binding for this new regulator driver
 - Fixed Kconfig typec notation to match others
 - Leave type C block disabled until enabled by a platform DTS

Add the required drivers for implementing type C orientation and role
detection using the Qualcomm PMIC.  Currently, PMICs such as the PM8150B
have an integrated type C block, which can be utilized for this.  This
series adds the dt-binding, PMIC type C driver, and DTS nodes.

The PMIC type C driver will register itself as a type C port w/ a
registered type C switch for orientation, and will fetch a USB role switch
handle for the role notifications.  It will also have the ability to enable
the VBUS output to any connected devices based on if the device is behaving
as a UFP or DFP.

Wesley Cheng (6):
  usb: typec: Add QCOM PMIC typec detection driver
  dt-bindings: usb: Add Qualcomm PMIC type C controller dt-binding
  arm64: boot: dts: qcom: pm8150b: Add node for USB type C block
  regulator: Add support for QCOM PMIC VBUS booster
  dt-bindings: regulator: Add dt-binding for QCOM PMIC VBUS output
    regulator
  arm64: boot: dts: qcom: pm8150b: Add DTS node for PMIC VBUS booster

 .../regulator/qcom,usb-vbus-regulator.yaml    |  41 +++
 .../bindings/usb/qcom,pmic-typec.yaml         | 113 +++++++
 arch/arm64/boot/dts/qcom/pm8150b.dtsi         |  13 +
 arch/arm64/boot/dts/qcom/sm8150-mtp.dts       |   4 +
 drivers/regulator/Kconfig                     |  10 +
 drivers/regulator/Makefile                    |   1 +
 drivers/regulator/qcom_usb_vbus-regulator.c   |  97 ++++++
 drivers/usb/typec/Kconfig                     |  12 +
 drivers/usb/typec/Makefile                    |   1 +
 drivers/usb/typec/qcom-pmic-typec.c           | 275 ++++++++++++++++++
 10 files changed, 567 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
 create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
 create mode 100644 drivers/regulator/qcom_usb_vbus-regulator.c
 create mode 100644 drivers/usb/typec/qcom-pmic-typec.c

--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
parents d69323ee a824bab7

Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/regulator/qcom,usb-vbus-regulator.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: The Qualcomm PMIC VBUS output regulator driver



maintainers:

  - Wesley Cheng <wcheng@codeaurora.org>



description: |

  This regulator driver controls the VBUS output by the Qualcomm PMIC.  This

  regulator will be enabled in situations where the device is required to

  provide power to the connected peripheral.



properties:

  compatible:

    enum:

      - qcom,pm8150b-vbus-reg



  reg:

    maxItems: 1

    description: VBUS output base address



required:

  - compatible



additionalProperties: false



examples:

  - |

     pm8150b {

        #address-cells = <1>;

        #size-cells = <0>;

        pm8150b_vbus: dcdc@1100 {

            compatible = "qcom,pm8150b-vbus-reg";

            reg = <0x1100>;

        };

     };

...

drivers/regulator/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -836,6 +836,16 @@ config REGULATOR_QCOM_SPMI 
	  Qualcomm SPMI PMICs as a module. The module will be named

	  "qcom_spmi-regulator".



config REGULATOR_QCOM_USB_VBUS

	tristate "Qualcomm USB Vbus regulator driver"

	depends on SPMI || COMPILE_TEST

	help

	  If you say yes to this option, support will be included for the

	  regulator used to enable the VBUS output.



	  Say M here if you want to include support for enabling the VBUS output

	  as a module. The module will be named "qcom_usb_vbus_regulator".



config REGULATOR_RC5T583

	tristate "RICOH RC5T583 Power regulators"

	depends on MFD_RC5T583

drivers/regulator/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o 
obj-$(CONFIG_REGULATOR_QCOM_RPMH) += qcom-rpmh-regulator.o

obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o

obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o

obj-$(CONFIG_REGULATOR_QCOM_USB_VBUS) += qcom_usb_vbus-regulator.o

obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o

obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o

obj-$(CONFIG_REGULATOR_PV88060) += pv88060-regulator.o

drivers/regulator/qcom_usb_vbus-regulator.c

0 → 100644
+97 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

//

// Qualcomm PMIC VBUS output regulator driver

//

// Copyright (c) 2020, The Linux Foundation. All rights reserved.



#include <linux/module.h>

#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/of_regulator.h>

#include <linux/regmap.h>



#define CMD_OTG				0x40

#define OTG_EN				BIT(0)

#define OTG_CFG				0x53

#define OTG_EN_SRC_CFG			BIT(1)



static const struct regulator_ops qcom_usb_vbus_reg_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,

};



static struct regulator_desc qcom_usb_vbus_rdesc = {

	.name = "usb_vbus",

	.ops = &qcom_usb_vbus_reg_ops,

	.owner = THIS_MODULE,

	.type = REGULATOR_VOLTAGE,

};



static int qcom_usb_vbus_regulator_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct regulator_dev *rdev;

	struct regmap *regmap;

	struct regulator_config config = { };

	struct regulator_init_data *init_data;

	int ret;

	u32 base;



	ret = of_property_read_u32(dev->of_node, "reg", &base);

	if (ret < 0) {

		dev_err(dev, "no base address found\n");

		return ret;

	}



	regmap = dev_get_regmap(dev->parent, NULL);

	if (regmap) {

		dev_err(dev, "Failed to get regmap\n");

		return -ENOENT;

	}



	init_data = of_get_regulator_init_data(dev, dev->of_node,

					       &qcom_usb_vbus_rdesc);

	if (!init_data)

		return -ENOMEM;



	qcom_usb_vbus_rdesc.enable_reg = base + CMD_OTG;

	qcom_usb_vbus_rdesc.enable_mask = OTG_EN;

	config.dev = dev;

	config.init_data = init_data;

	config.regmap = regmap;



	rdev = devm_regulator_register(dev, &qcom_usb_vbus_rdesc, &config);

	if (IS_ERR(rdev)) {

		ret = PTR_ERR(rdev);

		dev_err(dev, "not able to register vbus reg %d\n", ret);

		return ret;

	}



	/* Disable HW logic for VBUS enable */

	regmap_update_bits(regmap, base + OTG_CFG, OTG_EN_SRC_CFG, 0);



	return 0;

}



static const struct of_device_id qcom_usb_vbus_regulator_match[] = {

	{ .compatible = "qcom,pm8150b-vbus-reg" },

	{ }

};

MODULE_DEVICE_TABLE(of, qcom_usb_vbus_regulator_match);



static struct platform_driver qcom_usb_vbus_regulator_driver = {

	.driver		= {

		.name	= "qcom-usb-vbus-regulator",

		.of_match_table = qcom_usb_vbus_regulator_match,

	},

	.probe		= qcom_usb_vbus_regulator_probe,

};

module_platform_driver(qcom_usb_vbus_regulator_driver);



MODULE_DESCRIPTION("Qualcomm USB vbus regulator driver");

MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE