Enable USB type C support on SM8150
Subsystems (6)
PATCH v2 1/4 arm64: boot: dts: qcom: sm8150: Add nodes for PMIC based typec detection
In reply to Wesley ChengIntroduce required child nodes to enable the PMIC based USB type C driver. This consits of connector and endpoint nodes to drivers, which manage the type C mux and the USB role switch.
--- arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 40 ++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8150-mtp.dts +39 -1
@@ -413,6 +413,31 @@ &pm8150b_vbus { status = "okay"; }; +&pm8150b_typec { + status = "okay"; + connector { + compatible = "usb-c-connector"; + power-role = "dual"; + data-role = "dual"; + ports { + #address-cells = <1>; + #size-cells = <0>; + port@1 { + reg = <1>; + usb3_data_ss: endpoint@0 { + remote-endpoint = <&qmp_ss_mux>; + }; + }; + }; + }; + + port { + usb3_role: endpoint { + remote-endpoint = <&dwc3_drd_switch>; + }; + }; +}; + &usb_1_hsphy { status = "okay"; vdda-pll-supply = <&vdd_usb_hs_core>;
@@ -424,12 +449,25 @@ &usb_1_qmpphy { status = "okay"; vdda-phy-supply = <&vreg_l3c_1p2>; vdda-pll-supply = <&vdda_usb_ss_dp_core_1>; + orientation-switch; + port { + qmp_ss_mux: endpoint@0 { + remote-endpoint = <&usb3_data_ss>; + }; + }; }; &usb_1 { status = "okay"; + usb-role-switch; + port { + dwc3_drd_switch: endpoint@0 { + remote-endpoint = <&usb3_role>; + }; + }; }; &usb_1_dwc3 { - dr_mode = "peripheral"; + dr_mode = "otg"; + usb-role-switch; };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v2 3/4 usb: dwc3: dwc3-qcom: Find USB connector and register role switch
In reply to Wesley ChengIf registering a USB typeC connector, the connector node may not be a child of the DWC3 QCOM device. Utilize devcon graph search to lookup if any remote endpoints contain the connector. If a connector is present, the DWC3 QCOM will register a USB role switch to receive role change events, as well as attain a reference to the DWC3 core role switch to pass the event down.
--- drivers/usb/dwc3/dwc3-qcom.c | 120 ++++++++++++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 2 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +118 -2
@@ -19,6 +19,8 @@#include <linux/usb/of.h> #include <linux/reset.h> #include <linux/iopoll.h> +#include <linux/fwnode.h> +#include <linux/usb/role.h> #include "core.h"
@@ -71,6 +73,9 @@ struct dwc3_qcom {struct notifier_block vbus_nb;struct notifier_block host_nb; +struct usb_role_switch *role_sw; +struct usb_role_switch *dwc3_drd_sw; +const struct dwc3_acpi_pdata *acpi_pdata;enum usb_dr_mode mode;
@@ -190,6 +195,73 @@ static int dwc3_qcom_register_extcon(struct dwc3_qcom *qcom)return 0 ; } +static int dwc3_qcom_usb_role_switch_set (struct usb_role_switch *sw, +enum usb_role role) +{ +struct dwc3_qcom *qcom =usb_role_switch_get_drvdata (sw); +struct fwnode_handle *child; +bool enable = false; + +if (!qcom->dwc3_drd_sw) { + child =device_get_next_child_node (qcom->dev,NULL ); +if (child) { + qcom->dwc3_drd_sw =usb_role_switch_find_by_fwnode (child); +fwnode_handle_put (child); +if (IS_ERR (qcom->dwc3_drd_sw)) { + qcom->dwc3_drd_sw =NULL ; +return 0 ; + } + } + } + +usb_role_switch_set_role (qcom->dwc3_drd_sw, role); + +if (role ==USB_ROLE_DEVICE ) + enable = true; +else + enable = false; + + qcom->mode = (role ==USB_ROLE_HOST ) ?USB_DR_MODE_HOST : +USB_DR_MODE_PERIPHERAL ; +dwc3_qcom_vbus_overrride_enable (qcom, enable); +return 0 ; +} + +static enum usb_role dwc3_qcom_usb_role_switch_get (struct usb_role_switch *sw) +{ +struct dwc3_qcom *qcom =usb_role_switch_get_drvdata (sw); +enum usb_role role; + +switch (qcom->mode) { +case USB_DR_MODE_HOST : + role =USB_ROLE_HOST ; +break ; +case USB_DR_MODE_PERIPHERAL : + role =USB_ROLE_DEVICE ; +break ; +default : + role =USB_ROLE_DEVICE ; +break ; + } + +return role; +} + +static int dwc3_qcom_setup_role_switch (struct dwc3_qcom *qcom) +{ +struct usb_role_switch_desc dwc3_role_switch = {NULL }; + + dwc3_role_switch.fwnode =dev_fwnode (qcom->dev); + dwc3_role_switch.set = dwc3_qcom_usb_role_switch_set; + dwc3_role_switch.get = dwc3_qcom_usb_role_switch_get; + dwc3_role_switch.driver_data = qcom; + qcom->role_sw =usb_role_switch_register (qcom->dev, &dwc3_role_switch); +if (IS_ERR (qcom->role_sw)) +return PTR_ERR (qcom->role_sw); + +return 0 ; +} +static void dwc3_qcom_disable_interrupts (struct dwc3_qcom *qcom) {if (qcom->hs_phy_irq) {
@@ -540,6 +612,42 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev)return 0 ; } +static int dwc3_qcom_connector_check (struct fwnode_handle *fwnode) +{ +if (fwnode && (!fwnode_property_match_string (fwnode,"compatible" , +"gpio-usb-b-connector" ) || + !fwnode_property_match_string (fwnode,"compatible" , +"usb-c-connector" ))) +return 1 ; + +return 0 ; +} + +static void *dwc3_qcom_find_usb_connector_match (struct device_connection *con, +int ep,void *data) +{ +struct fwnode_handle *fwnode; + +/* Check if the "connector" node is the parent of the remote endpoint */ +if (dwc3_qcom_connector_check (con->fwnode)) +return fwnode; + +/* else, check if it is a child node */ + fwnode =fwnode_get_named_child_node (con->fwnode,"connector" ); +if (dwc3_qcom_connector_check (fwnode)) +return fwnode; + +return 0 ; +} + +static bool dwc3_qcom_find_usb_connector (struct platform_device *pdev) +{ +struct fwnode_handle *fwnode = pdev->dev.fwnode; + +return fwnode_connection_find_match (fwnode,"connector" ,NULL , + dwc3_qcom_find_usb_connector_match); +} +static int dwc3_qcom_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;
@@ -644,8 +752,13 @@ static int dwc3_qcom_probe(struct platform_device *pdev)if (qcom->mode ==USB_DR_MODE_PERIPHERAL )dwc3_qcom_vbus_overrride_enable (qcom, true); -/* register extcon to override sw_vbus on Vbus change later */ - ret =dwc3_qcom_register_extcon (qcom); +if (dwc3_qcom_find_usb_connector (pdev)) { + ret =dwc3_qcom_setup_role_switch (qcom); + }else { +/* register extcon to override sw_vbus on Vbus change later */ + ret =dwc3_qcom_register_extcon (qcom); + } +if (ret) goto depopulate;
@@ -679,6 +792,9 @@ static int dwc3_qcom_remove(struct platform_device *pdev)struct device *dev = &pdev->dev;int i; +usb_role_switch_unregister (qcom->role_sw); +usb_role_switch_put (qcom->dwc3_drd_sw); +of_platform_depopulate (dev);for (i = qcom->num_clocks -1 ; i >=0 ; i--) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v2 2/4 phy: qcom-qmp: Register as a typec switch for orientation detection
In reply to Wesley ChengThe lane select switch for USB typec orientation is within the USB QMP PHY. the current device. It could be connected through an endpoint, to an independent device handling the typec detection, ie the QCOM SPMI typec driver.
--- drivers/phy/qualcomm/Kconfig | 11 +++++ drivers/phy/qualcomm/phy-qcom-qmp.c | 70 +++++++++++++++++++++++++++-- 2 files changed, 78 insertions(+), 3 deletions(-)
drivers/phy/qualcomm/Kconfig +11 -0
@@ -48,6 +48,17 @@ config PHY_QCOM_QMP Enable this to support the QMP PHY transceiver that is used with controllers such as PCIe, UFS, and USB on Qualcomm chips. +if PHY_QCOM_QMP +config PHY_QCOM_QMP_TYPEC + bool "Enable QCOM QMP PHY Type C Switch Support" + depends on PHY_QCOM_QMP=y && TYPEC=y || PHY_QCOM_QMP=m && TYPEC + help + Register a type C switch from the QMP PHY driver for type C + orientation support. This has dependencies with if the type C kernel + configuration is enabled or not. This support will not be present if + USB type C is disabled. +endif + config PHY_QCOM_QUSB2 tristate "Qualcomm QUSB2 PHY Driver" depends on OF && (ARCH_QCOM || COMPILE_TEST)
drivers/phy/qualcomm/phy-qcom-qmp.c +67 -3
136 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
PATCH v2 4/4 usb: dwc3: dwc3-qcom: Fix typo in the dwc3 vbus override API
In reply to Wesley ChengThere was an extra character in the dwc3_qcom_vbus_override_enable() function. Removed the extra character.
--- drivers/usb/dwc3/dwc3-qcom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +5 -5
@@ -107,7 +107,7 @@ static inline void dwc3_qcom_clrbits(void __iomem *base, u32 offset, u32 val)readl (base + offset); } -static void dwc3_qcom_vbus_overrride_enable (struct dwc3_qcom *qcom,bool enable) +static void dwc3_qcom_vbus_override_enable (struct dwc3_qcom *qcom,bool enable) {if (enable) { dwc3_qcom_setbits(qcom->qscratch_base, QSCRATCH_SS_PHY_CTRL,
@@ -128,7 +128,7 @@ static int dwc3_qcom_vbus_notifier(struct notifier_block *nb, struct dwc3_qcom *qcom = container_of(nb, struct dwc3_qcom, vbus_nb);/* enable vbus override for device mode */ -dwc3_qcom_vbus_overrride_enable (qcom, event); +dwc3_qcom_vbus_override_enable (qcom, event); qcom->mode = event ?USB_DR_MODE_PERIPHERAL :USB_DR_MODE_HOST ;return NOTIFY_DONE ;
@@ -140,7 +140,7 @@ static int dwc3_qcom_host_notifier(struct notifier_block *nb, struct dwc3_qcom *qcom = container_of(nb, struct dwc3_qcom, host_nb);/* disable vbus override in host mode */ -dwc3_qcom_vbus_overrride_enable (qcom, !event); +dwc3_qcom_vbus_override_enable (qcom, !event); qcom->mode = event ?USB_DR_MODE_HOST :USB_DR_MODE_PERIPHERAL ;return NOTIFY_DONE ;
@@ -223,7 +223,7 @@ static int dwc3_qcom_usb_role_switch_set(struct usb_role_switch *sw, qcom->mode = (role ==USB_ROLE_HOST ) ?USB_DR_MODE_HOST :USB_DR_MODE_PERIPHERAL ; -dwc3_qcom_vbus_overrride_enable (qcom, enable); +dwc3_qcom_vbus_override_enable (qcom, enable);return 0 ; }
@@ -750,7 +750,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)/* enable vbus override for device mode */ if (qcom->mode ==USB_DR_MODE_PERIPHERAL ) -dwc3_qcom_vbus_overrride_enable (qcom, true); +dwc3_qcom_vbus_override_enable (qcom, true);if (dwc3_qcom_find_usb_connector (pdev)) { ret =dwc3_qcom_setup_role_switch (qcom);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
v2 cover Enable USB type C support on SM8150
Changes in v2:
- Added patch to fix a typo in dwc3_qcom_vbus_override_enable()
- Modified dwc3_qcom_find_usb_connector_match() to search the child nodes for the connector device as well
- Moved out the DRD switch remote endpoint from the connector node in the pm8150b_typec device
This series adds support for setting of the orientation multiplexor within the QMP PHY based on the detection output from the PM8150B. It will also introduce a role switch in DWC3 QCOM, which is used so that the DWC3 QCOM glue can receive role switch change events, and set the vbus override accordingly. This event will then be propagated down to the DWC3 core driver, by the DWC3 QCOM getting a handle to the DWC3 core's role switch.
Wesley Cheng (4):
arm64: boot: dts: qcom: sm8150: Add nodes for PMIC based typec
detection
phy: qcom-qmp: Register as a typec switch for orientation detection
usb: dwc3: dwc3-qcom: Find USB connector and register role switch
usb: dwc3: dwc3-qcom: Fix typo in the dwc3 vbus override API
arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 40 +++++++- drivers/phy/qualcomm/Kconfig | 11 ++ drivers/phy/qualcomm/phy-qcom-qmp.c | 70 ++++++++++++- drivers/usb/dwc3/dwc3-qcom.c | 128 ++++++++++++++++++++++-- 4 files changed, 239 insertions(+), 10 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project