Introduce PMIC based USB type C detection
Subsystems (6)
v7 cover Introduce PMIC based USB type C detection
Changes in v7:
- Fixups in qcom-pmic-typec.c to remove uncesscary includes, printk formatting, and revising some logic operations.
Changes in v6:
- Removed qcom_usb_vbus-regulator.c and qcom,usb-vbus-regulator.yaml from the series as they have been merged on regulator.git
- Added separate references to the usb-connector.yaml in qcom,pmic-typec.yaml instead of referencing the entire schema.
Changes in v5:
- Fix dt_binding_check warning/error in qcom,pmic-typec.yaml
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 (4):
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
arm64: boot: dts: qcom: pm8150b: Add DTS node for PMIC VBUS booster
.../bindings/usb/qcom,pmic-typec.yaml | 131 +++++++++ arch/arm64/boot/dts/qcom/pm8150b.dtsi | 13 + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4 + drivers/usb/typec/Kconfig | 12 + drivers/usb/typec/Makefile | 1 + drivers/usb/typec/qcom-pmic-typec.c | 272 ++++++++++++++++++ 6 files changed, 433 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml create mode 100644 drivers/usb/typec/qcom-pmic-typec.c
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v7 1/4 usb: typec: Add QCOM PMIC typec detection driver
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.
--- drivers/usb/typec/Kconfig | 12 ++ drivers/usb/typec/Makefile | 1 + drivers/usb/typec/qcom-pmic-typec.c | 271 ++++++++++++++++++++++++++++ 3 files changed, 284 insertions(+) create mode 100644 drivers/usb/typec/qcom-pmic-typec.c
drivers/usb/typec/Kconfig +12 -0
@@ -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 || COMPILE_TEST + 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"
drivers/usb/typec/Makefile +1 -0
@@ -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/
drivers/usb/typec/qcom-pmic-typec.c new file +271 -0
271 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v7 1/4] usb: typec: Add QCOM PMIC typec detection driver
Quoting Wesley Cheng (2020-08-03 17:45:20)
Quoted 9 lines
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 <[email protected]>Acked-by Heikki Krogerus <[email protected]>---
PATCH v7 2/4 dt-bindings: usb: Add Qualcomm PMIC type C controller dt-binding
In reply to Wesley ChengIntroduce the dt-binding for enabling USB type C orientation and role detection using the PM8150B. The driver will be responsible for receiving the interrupt at a state change on the CC lines, reading the orientation/role, and communicating this information to the remote clients, which can include a role switch node and a type C switch.
--- .../bindings/usb/qcom,pmic-typec.yaml | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml new file +131 -0
@@ -0,0 +1,131 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/usb/qcom,pmic-typec.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Qualcomm PMIC based USB type C Detection Driver + +maintainers: + - Wesley Cheng <[email protected]> + +description: | + Qualcomm PMIC Type C Detect + +properties: + compatible: + enum: + - qcom,pm8150b-usb-typec + + reg: + maxItems: 1 + description: Type C base address + + interrupts: + maxItems: 1 + description: CC change interrupt from PMIC + + connector: + description: Connector type for remote endpoints + type: object + + properties: + compatible: + $ref: /schemas/connector/usb-connector.yaml#/properties/compatible + enum: + - usb-c-connector + + power-role: + $ref: /schemas/connector/usb-connector.yaml#/properties/power-role + enum: + - dual + - source + - sink + + data-role: + $ref: /schemas/connector/usb-connector.yaml#/properties/data-role + enum: + - dual + - host + - device + + ports: + description: Remote endpoint connections + type: object + $ref: /schemas/connector/usb-connector.yaml#/properties/ports + + properties: + port@0: + description: Remote endpoints for the High Speed path + type: object + + port@1: + description: Remote endpoints for the Super Speed path + type: object + + properties: + endpoint@0: + description: Connection to USB type C mux node + type: object + + properties: + remote-endpoint: + description: Node reference to the type C mux + + endpoint@1: + description: Connection to role switch node + type: object + + properties: + remote-endpoint: + description: Node reference to the role switch node + + required: + - compatible + +required: + - compatible + - interrupts + - connector + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + pm8150b { + #address-cells = <1>; + #size-cells = <0>; + pm8150b_typec: typec@1500 { + compatible = "qcom,pm8150b-usb-typec"; + reg = <0x1500>; + interrupts = <0x2 0x15 0x5 IRQ_TYPE_EDGE_RISING>; + + connector { + compatible = "usb-c-connector"; + power-role = "dual"; + data-role = "dual"; + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + }; + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + usb3_data_ss: endpoint@0 { + reg = <0>; + remote-endpoint = <&qmp_ss_mux>; + }; + usb3_role: endpoint@1 { + reg = <1>; + remote-endpoint = <&dwc3_drd_switch>; + }; + }; + }; + }; + }; + }; +...
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Rob Herring
maintainerRe: [PATCH v7 2/4] dt-bindings: usb: Add Qualcomm PMIC type C controller dt-binding
Quoted 42 lines · Wesley Cheng
Introduce the dt-binding for enabling USB type C orientation and role detection using the PM8150B. The driver will be responsible for receiving the interrupt at a state change on the CC lines, reading the orientation/role, and communicating this information to the remote clients, which can include a role switch node and a type C switch.
Signed-off-by Wesley Cheng <[email protected]>--- .../bindings/usb/qcom,pmic-typec.yaml | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yamlDocumentation/devicetree/bindings/usb/qcom,pmic-typec.yaml new file +24
-0@@ -0,0 +1,131 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/usb/qcom,pmic-typec.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Qualcomm PMIC based USB type C Detection Driver + +maintainers: + - Wesley Cheng <[email protected]> + +description: | + Qualcomm PMIC Type C Detect + +properties: + compatible: + enum: + - qcom,pm8150b-usb-typec + + reg: + maxItems: 1 + description: Type C base address + + interrupts:
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml line 34
Quoted 10 lines
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml new file +10
-0+ maxItems: 1 + description: CC change interrupt from PMIC + + connector: + description: Connector type for remote endpoints + type: object + + properties: + compatible: + $ref: /schemas/connector/usb-connector.yaml#/properties/compatible
usb-connector.yaml should be referenced from 'connector'.
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml line 43
Quoted 9 lines
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml new file +9
-0+ enum: + - usb-c-connector + + power-role: + $ref: /schemas/connector/usb-connector.yaml#/properties/power-role + enum: + - dual + - source + - sink
Just 'power-role: true' is enough as this is the same set of possible values.
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml line 50
Quoted 7 lines
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml new file +7
-0+ + data-role: + $ref: /schemas/connector/usb-connector.yaml#/properties/data-role + enum: + - dual + - host + - device
Same here
Quoted 13 lines
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml new file +13
-0+ + ports: + description: Remote endpoint connections + type: object + $ref: /schemas/connector/usb-connector.yaml#/properties/ports + + properties: + port@0: + description: Remote endpoints for the High Speed path + type: object + + port@1: + description: Remote endpoints for the Super Speed path
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml line 73
Quoted 10 lines
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml new file +10
-0+ type: object + + properties: + endpoint@0: + description: Connection to USB type C mux node + type: object + + properties: + remote-endpoint: + description: Node reference to the type C mux
You don't need to describe 'remote-endpoint'. You can assume that is defined in a common graph schema (to be written).
Quoted 62 lines
Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml new file +58
-0+ + endpoint@1: + description: Connection to role switch node + type: object + + properties: + remote-endpoint: + description: Node reference to the role switch node + + required: + - compatible + +required: + - compatible + - interrupts + - connector + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + pm8150b { + #address-cells = <1>; + #size-cells = <0>; + pm8150b_typec: typec@1500 { + compatible = "qcom,pm8150b-usb-typec"; + reg = <0x1500>; + interrupts = <0x2 0x15 0x5 IRQ_TYPE_EDGE_RISING>; + + connector { + compatible = "usb-c-connector"; + power-role = "dual"; + data-role = "dual"; + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + }; + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + usb3_data_ss: endpoint@0 { + reg = <0>; + remote-endpoint = <&qmp_ss_mux>; + }; + usb3_role: endpoint@1 { + reg = <1>; + remote-endpoint = <&dwc3_drd_switch>; + }; + }; + }; + }; + }; + }; +...Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v7 3/4 arm64: boot: dts: qcom: pm8150b: Add node for USB type C block
In reply to Wesley ChengThe PM8150B has a dedicated USB type C block, which can be used for type C orientation and role detection. Create the reference node to this type C block for further use.
--- arch/arm64/boot/dts/qcom/pm8150b.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm64/boot/dts/qcom/pm8150b.dtsi +7 -0
@@ -53,6 +53,13 @@ power-on@800 { status = "disabled"; }; + pm8150b_typec: typec@1500 { + compatible = "qcom,pm8150b-usb-typec"; + status = "disabled"; + reg = <0x1500>; + interrupts = <0x2 0x15 0x5 IRQ_TYPE_EDGE_RISING>; + }; + pm8150b_temp: temp-alarm@2400 { compatible = "qcom,spmi-temp-alarm"; reg = <0x2400>;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v7 4/4 arm64: boot: dts: qcom: pm8150b: Add DTS node for PMIC VBUS booster
In reply to Wesley ChengAdd the required DTS node for the USB VBUS output regulator, which is available on PM8150B. This will provide the VBUS source to connected peripherals.
--- arch/arm64/boot/dts/qcom/pm8150b.dtsi | 6 ++++++ arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4 ++++ 2 files changed, 10 insertions(+)
arch/arm64/boot/dts/qcom/pm8150b.dtsi +6 -0
@@ -53,6 +53,12 @@ power-on@800 { status = "disabled"; }; + pm8150b_vbus: dcdc@1100 { + compatible = "qcom,pm8150b-vbus-reg"; + status = "disabled"; + reg = <0x1100>; + }; + pm8150b_typec: typec@1500 { compatible = "qcom,pm8150b-usb-typec"; status = "disabled";
arch/arm64/boot/dts/qcom/sm8150-mtp.dts +4 -0
@@ -409,6 +409,10 @@ &ufs_mem_phy { vdda-pll-max-microamp = <19000>; }; +&pm8150b_vbus { + status = "okay"; +}; + &usb_1_hsphy { status = "okay"; vdda-pll-supply = <&vdd_usb_hs_core>;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project