| Message ID | 20230413113438.1577658-14-bryan.odonoghue@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add Qualcomm PMIC TPCM support | expand |
On Thu, Apr 13, 2023 at 12:34:37PM +0100, Bryan O'Donoghue wrote: > This commit adds a QCOM PMIC TCPM driver with an initial pm8150b > block. > > qcom_pmic_virt_tcpm.c : Responsible for registering with TCPM and > arbitrates access to the Type-C and PDPHY hardware > blocks in one place. > This driver presents a virtual device to the Linux > TCPM layer. > > qcom_pmic_pdphy.c: Rsponsible for interfacing with the PDPHY hardware and > processing power-delivery related calls from TCPM. > This hardware binding can be extended to facilitate > similar hardware in different PMICs. > > qcom_pmic_typec.c: Responsible for notifying and processing Type-C > related calls from TCPM. > This hardware binding can be extended to facilitate > similar hardware in different PMICs. > > This code provides all of the same functionality as the existing > qcom typec driver plus power-delivery as well. > > As a result commit 6c8cf3695176 ("usb: typec: Add QCOM PMIC typec detection > driver") can be deleted entirely. > > References code from Jonathan Marek, Jack Pham, Wesley Cheng, Hemant Kumar, > Guru Das Srinagesh and Ashay Jaiswal. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> I think you need to rewrite the commit message - you still have that third driver in there - but otherwise I don't have any more comments. I hope Guenter has time to check this. In any case, FWIW: Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > MAINTAINERS | 10 + > drivers/usb/typec/Kconfig | 13 - > drivers/usb/typec/Makefile | 1 - > drivers/usb/typec/qcom-pmic-typec.c | 261 -------- > drivers/usb/typec/tcpm/Kconfig | 11 + > drivers/usb/typec/tcpm/Makefile | 1 + > drivers/usb/typec/tcpm/qcom/Makefile | 6 + > drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 362 +++++++++++ > .../typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 528 +++++++++++++++++ > .../typec/tcpm/qcom/qcom_pmic_typec_pdphy.h | 115 ++++ > .../typec/tcpm/qcom/qcom_pmic_typec_port.c | 560 ++++++++++++++++++ > .../typec/tcpm/qcom/qcom_pmic_typec_port.h | 194 ++++++ > 12 files changed, 1787 insertions(+), 275 deletions(-) > delete mode 100644 drivers/usb/typec/qcom-pmic-typec.c > create mode 100644 drivers/usb/typec/tcpm/qcom/Makefile > create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c > create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c > create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h > create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c > create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 14a825f2bfb23..35d71858e768b 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -17530,6 +17530,16 @@ S: Maintained > F: Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > F: drivers/thermal/qcom/ > > +QUALCOMM TYPEC PORT MANAGER DRIVER > +M: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > +L: linux-arm-msm@vger.kernel.org > +L: linux-usb@vger.kernel.org > +S: Maintained > +F: Documentation/devicetree/bindings/usb/qcom,pmic-*.yaml > +F: drivers/usb/typec/tcpm/qcom/ > +F: include/dt-bindings/usb/typec/qcom,pmic-pdphy.h > +F: include/dt-bindings/usb/typec/qcom,pmic-typec.h > + > QUALCOMM VENUS VIDEO ACCELERATOR DRIVER > M: Stanimir Varbanov <stanimir.k.varbanov@gmail.com> > M: Vikash Garodia <quic_vgarodia@quicinc.com> > diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig > index 831e7049977df..2f80c2792dbda 100644 > --- a/drivers/usb/typec/Kconfig > +++ b/drivers/usb/typec/Kconfig > @@ -100,19 +100,6 @@ config TYPEC_STUSB160X > If you choose to build this driver as a dynamically linked module, the > module will be called stusb160x.ko. > > -config TYPEC_QCOM_PMIC > - tristate "Qualcomm PMIC USB Type-C driver" > - depends on ARCH_QCOM || COMPILE_TEST > - depends on USB_ROLE_SWITCH || !USB_ROLE_SWITCH > - 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. > - > config TYPEC_WUSB3801 > tristate "Willsemi WUSB3801 Type-C port controller driver" > depends on I2C > diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile > index 4a83dad51a6cf..7a368fea61bc9 100644 > --- a/drivers/usb/typec/Makefile > +++ b/drivers/usb/typec/Makefile > @@ -8,7 +8,6 @@ obj-$(CONFIG_TYPEC_UCSI) += ucsi/ > obj-$(CONFIG_TYPEC_TPS6598X) += tipd/ > obj-$(CONFIG_TYPEC_ANX7411) += anx7411.o > obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o > -obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom-pmic-typec.o > obj-$(CONFIG_TYPEC_STUSB160X) += stusb160x.o > obj-$(CONFIG_TYPEC_RT1719) += rt1719.o > obj-$(CONFIG_TYPEC_WUSB3801) += wusb3801.o > diff --git a/drivers/usb/typec/qcom-pmic-typec.c b/drivers/usb/typec/qcom-pmic-typec.c > deleted file mode 100644 > index 432ea62f1bab6..0000000000000 > --- a/drivers/usb/typec/qcom-pmic-typec.c > +++ /dev/null > @@ -1,261 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* > - * Copyright (c) 2020, The Linux Foundation. All rights reserved. > - */ > - > -#include <linux/err.h> > -#include <linux/interrupt.h> > -#include <linux/kernel.h> > -#include <linux/mod_devicetable.h> > -#include <linux/module.h> > -#include <linux/platform_device.h> > -#include <linux/regmap.h> > -#include <linux/regulator/consumer.h> > -#include <linux/slab.h> > -#include <linux/usb/role.h> > -#include <linux/usb/typec_mux.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 regmap *regmap; > - u32 base; > - > - 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; > - > - if (enable == qcom_usb->vbus_enabled) > - 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) ? > - 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, > - enum typec_port_type type) > -{ > - 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 (type == TYPEC_PORT_SRC) > - mode = EN_SRC_ONLY; > - else if (type == TYPEC_PORT_SNK) > - mode = EN_SNK_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 qcom_pmic_typec *qcom_usb; > - struct device *dev = &pdev->dev; > - struct fwnode_handle *fwnode; > - struct typec_capability cap; > - const char *buf; > - int ret, irq, role; > - u32 reg; > - > - ret = device_property_read_u32(dev, "reg", ®); > - if (ret < 0) { > - dev_err(dev, "missing base address\n"); > - 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; > - } > - > - qcom_usb->vbus_reg = devm_regulator_get(qcom_usb->dev, "usb_vbus"); > - if (IS_ERR(qcom_usb->vbus_reg)) > - return PTR_ERR(qcom_usb->vbus_reg); > - > - fwnode = device_get_named_child_node(dev, "connector"); > - if (!fwnode) > - return -EINVAL; > - > - ret = fwnode_property_read_string(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(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 = 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; > - } > - fwnode_handle_put(fwnode); > - > - qcom_usb->role_sw = fwnode_usb_role_switch_get(dev_fwnode(qcom_usb->dev)); > - if (IS_ERR(qcom_usb->role_sw)) { > - ret = dev_err_probe(dev, PTR_ERR(qcom_usb->role_sw), > - "failed to get role switch\n"); > - goto err_typec_port; > - } > - > - irq = platform_get_irq(pdev, 0); > - if (irq < 0) > - goto err_usb_role_sw; > - > - 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"); > - goto err_usb_role_sw; > - } > - > - platform_set_drvdata(pdev, qcom_usb); > - qcom_pmic_typec_typec_hw_init(qcom_usb, cap.type); > - qcom_pmic_typec_check_connection(qcom_usb); > - > - return 0; > - > -err_usb_role_sw: > - usb_role_switch_put(qcom_usb->role_sw); > -err_typec_port: > - typec_unregister_port(qcom_usb->port); > -err_put_node: > - fwnode_handle_put(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); > - > - 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"); > diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig > index e6b88ca4a4b94..5d393f520fc2f 100644 > --- a/drivers/usb/typec/tcpm/Kconfig > +++ b/drivers/usb/typec/tcpm/Kconfig > @@ -76,4 +76,15 @@ config TYPEC_WCOVE > To compile this driver as module, choose M here: the module will be > called typec_wcove.ko > > +config TYPEC_QCOM_PMIC > + tristate "Qualcomm PMIC USB Type-C Port Controller Manager driver" > + depends on ARCH_QCOM || COMPILE_TEST > + help > + A Type-C port and Power Delivery driver which aggregates two > + discrete pieces of silicon in the PM8150b PMIC block: the > + Type-C port controller and the Power Delivery PHY. > + > + This driver enables Type-C role switching, orientation, Alternate > + mode and Power Delivery support both for VBUS and VCONN. > + > endif # TYPEC_TCPM > diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile > index 08e57bb499cbc..7a8cad0c0bdb4 100644 > --- a/drivers/usb/typec/tcpm/Makefile > +++ b/drivers/usb/typec/tcpm/Makefile > @@ -9,3 +9,4 @@ obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.o > obj-$(CONFIG_TYPEC_TCPCI_MT6370) += tcpci_mt6370.o > obj-$(CONFIG_TYPEC_TCPCI_MAXIM) += tcpci_maxim.o > tcpci_maxim-y += tcpci_maxim_core.o maxim_contaminant.o > +obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom/ > diff --git a/drivers/usb/typec/tcpm/qcom/Makefile b/drivers/usb/typec/tcpm/qcom/Makefile > new file mode 100644 > index 0000000000000..dc1e8832e197a > --- /dev/null > +++ b/drivers/usb/typec/tcpm/qcom/Makefile > @@ -0,0 +1,6 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom_pmic_tcpm.o > +qcom_pmic_tcpm-y += qcom_pmic_typec.o \ > + qcom_pmic_typec_port.o \ > + qcom_pmic_typec_pdphy.o > diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c > new file mode 100644 > index 0000000000000..1e663988535f4 > --- /dev/null > +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c > @@ -0,0 +1,362 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2023, Linaro Ltd. All rights reserved. > + */ > + > +#include <linux/err.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.h> > +#include <linux/mod_devicetable.h> > +#include <linux/module.h> > +#include <linux/of_device.h> > +#include <linux/of_graph.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > +#include <linux/regulator/consumer.h> > +#include <linux/slab.h> > +#include <linux/usb/role.h> > +#include <linux/usb/tcpm.h> > +#include <linux/usb/typec_mux.h> > +#include "qcom_pmic_typec_pdphy.h" > +#include "qcom_pmic_typec_port.h" > + > +struct pmic_typec_resources { > + struct pmic_typec_pdphy_resources *pdphy_res; > + struct pmic_typec_port_resources *port_res; > +}; > + > +struct pmic_typec { > + struct device *dev; > + struct tcpm_port *tcpm_port; > + struct tcpc_dev tcpc; > + struct pmic_typec_pdphy *pmic_typec_pdphy; > + struct pmic_typec_port *pmic_typec_port; > + bool vbus_enabled; > + struct mutex lock; /* VBUS state serialization */ > +}; > + > +#define tcpc_to_tcpm(_tcpc_) container_of(_tcpc_, struct pmic_typec, tcpc) > + > +static int qcom_pmic_typec_get_vbus(struct tcpc_dev *tcpc) > +{ > + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); > + int ret; > + > + mutex_lock(&tcpm->lock); > + ret = tcpm->vbus_enabled || qcom_pmic_typec_port_get_vbus(tcpm->pmic_typec_port); > + mutex_unlock(&tcpm->lock); > + > + return ret; > +} > + > +static int qcom_pmic_typec_set_vbus(struct tcpc_dev *tcpc, bool on, bool sink) > +{ > + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); > + int ret = 0; > + > + mutex_lock(&tcpm->lock); > + if (tcpm->vbus_enabled == on) > + goto done; > + > + ret = qcom_pmic_typec_port_set_vbus(tcpm->pmic_typec_port, on); > + if (ret) > + goto done; > + > + tcpm->vbus_enabled = on; > + tcpm_vbus_change(tcpm->tcpm_port); > + > +done: > + dev_dbg(tcpm->dev, "set_vbus set: %d result %d\n", on, ret); > + mutex_unlock(&tcpm->lock); > + > + return ret; > +} > + > +static int qcom_pmic_typec_set_vconn(struct tcpc_dev *tcpc, bool on) > +{ > + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); > + > + return qcom_pmic_typec_port_set_vconn(tcpm->pmic_typec_port, on); > +} > + > +static int qcom_pmic_typec_get_cc(struct tcpc_dev *tcpc, > + enum typec_cc_status *cc1, > + enum typec_cc_status *cc2) > +{ > + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); > + > + return qcom_pmic_typec_port_get_cc(tcpm->pmic_typec_port, cc1, cc2); > +} > + > +static int qcom_pmic_typec_set_cc(struct tcpc_dev *tcpc, > + enum typec_cc_status cc) > +{ > + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); > + > + return qcom_pmic_typec_port_set_cc(tcpm->pmic_typec_port, cc); > +} > + > +static int qcom_pmic_typec_set_polarity(struct tcpc_dev *tcpc, > + enum typec_cc_polarity pol) > +{ > + /* Polarity is set separately by phy-qcom-qmp.c */ > + return 0; > +} > + > +static int qcom_pmic_typec_start_toggling(struct tcpc_dev *tcpc, > + enum typec_port_type port_type, > + enum typec_cc_status cc) > +{ > + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); > + > + return qcom_pmic_typec_port_start_toggling(tcpm->pmic_typec_port, > + port_type, cc); > +} > + > +static int qcom_pmic_typec_set_roles(struct tcpc_dev *tcpc, bool attached, > + enum typec_role power_role, > + enum typec_data_role data_role) > +{ > + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); > + > + return qcom_pmic_typec_pdphy_set_roles(tcpm->pmic_typec_pdphy, > + data_role, power_role); > +} > + > +static int qcom_pmic_typec_set_pd_rx(struct tcpc_dev *tcpc, bool on) > +{ > + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); > + > + return qcom_pmic_typec_pdphy_set_pd_rx(tcpm->pmic_typec_pdphy, on); > +} > + > +static int qcom_pmic_typec_pd_transmit(struct tcpc_dev *tcpc, > + enum tcpm_transmit_type type, > + const struct pd_message *msg, > + unsigned int negotiated_rev) > +{ > + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); > + > + return qcom_pmic_typec_pdphy_pd_transmit(tcpm->pmic_typec_pdphy, type, > + msg, negotiated_rev); > +} > + > +static int qcom_pmic_typec_init(struct tcpc_dev *tcpc) > +{ > + return 0; > +} > + > +static int qcom_pmic_typec_probe(struct platform_device *pdev) > +{ > + struct pmic_typec *tcpm; > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + const struct pmic_typec_resources *res; > + struct regmap *regmap; > + u32 base[2]; > + int ret; > + > + res = of_device_get_match_data(dev); > + if (!res) > + return -ENODEV; > + > + tcpm = devm_kzalloc(dev, sizeof(*tcpm), GFP_KERNEL); > + if (!tcpm) > + return -ENOMEM; > + > + tcpm->dev = dev; > + tcpm->tcpc.init = qcom_pmic_typec_init; > + tcpm->tcpc.get_vbus = qcom_pmic_typec_get_vbus; > + tcpm->tcpc.set_vbus = qcom_pmic_typec_set_vbus; > + tcpm->tcpc.set_cc = qcom_pmic_typec_set_cc; > + tcpm->tcpc.get_cc = qcom_pmic_typec_get_cc; > + tcpm->tcpc.set_polarity = qcom_pmic_typec_set_polarity; > + tcpm->tcpc.set_vconn = qcom_pmic_typec_set_vconn; > + tcpm->tcpc.start_toggling = qcom_pmic_typec_start_toggling; > + tcpm->tcpc.set_pd_rx = qcom_pmic_typec_set_pd_rx; > + tcpm->tcpc.set_roles = qcom_pmic_typec_set_roles; > + tcpm->tcpc.pd_transmit = qcom_pmic_typec_pd_transmit; > + > + regmap = dev_get_regmap(dev->parent, NULL); > + if (!regmap) { > + dev_err(dev, "Failed to get regmap\n"); > + return -ENODEV; > + } > + > + ret = of_property_read_u32_array(np, "reg", base, 2); > + if (ret) > + return ret; > + > + tcpm->pmic_typec_port = qcom_pmic_typec_port_alloc(dev); > + if (IS_ERR(tcpm->pmic_typec_port)) > + return PTR_ERR(tcpm->pmic_typec_port); > + > + tcpm->pmic_typec_pdphy = qcom_pmic_typec_pdphy_alloc(dev); > + if (IS_ERR(tcpm->pmic_typec_pdphy)) > + return PTR_ERR(tcpm->pmic_typec_pdphy); > + > + ret = qcom_pmic_typec_port_probe(pdev, tcpm->pmic_typec_port, > + res->port_res, regmap, base[0]); > + if (ret) > + return ret; > + > + ret = qcom_pmic_typec_pdphy_probe(pdev, tcpm->pmic_typec_pdphy, > + res->pdphy_res, regmap, base[1]); > + if (ret) > + return ret; > + > + mutex_init(&tcpm->lock); > + platform_set_drvdata(pdev, tcpm); > + > + tcpm->tcpc.fwnode = device_get_named_child_node(tcpm->dev, "connector"); > + if (IS_ERR(tcpm->tcpc.fwnode)) > + return PTR_ERR(tcpm->tcpc.fwnode); > + > + tcpm->tcpm_port = tcpm_register_port(tcpm->dev, &tcpm->tcpc); > + if (IS_ERR(tcpm->tcpm_port)) { > + ret = PTR_ERR(tcpm->tcpm_port); > + goto fwnode_remove; > + } > + > + ret = qcom_pmic_typec_port_start(tcpm->pmic_typec_port, > + tcpm->tcpm_port); > + if (ret) > + goto fwnode_remove; > + > + ret = qcom_pmic_typec_pdphy_start(tcpm->pmic_typec_pdphy, > + tcpm->tcpm_port); > + if (ret) > + goto fwnode_remove; > + > + return 0; > + > +fwnode_remove: > + fwnode_remove_software_node(tcpm->tcpc.fwnode); > + > + return ret; > +} > + > +static int qcom_pmic_typec_remove(struct platform_device *pdev) > +{ > + struct pmic_typec *tcpm = platform_get_drvdata(pdev); > + > + qcom_pmic_typec_pdphy_stop(tcpm->pmic_typec_pdphy); > + qcom_pmic_typec_port_stop(tcpm->pmic_typec_port); > + tcpm_unregister_port(tcpm->tcpm_port); > + fwnode_remove_software_node(tcpm->tcpc.fwnode); > + > + return 0; > +} > + > +static struct pmic_typec_pdphy_resources pm8150b_pdphy_res = { > + .irq_params = { > + { > + .virq = PMIC_PDPHY_SIG_TX_IRQ, > + .irq_name = "sig-tx", > + }, > + { > + .virq = PMIC_PDPHY_SIG_RX_IRQ, > + .irq_name = "sig-rx", > + }, > + { > + .virq = PMIC_PDPHY_MSG_TX_IRQ, > + .irq_name = "msg-tx", > + }, > + { > + .virq = PMIC_PDPHY_MSG_RX_IRQ, > + .irq_name = "msg-rx", > + }, > + { > + .virq = PMIC_PDPHY_MSG_TX_FAIL_IRQ, > + .irq_name = "msg-tx-failed", > + }, > + { > + .virq = PMIC_PDPHY_MSG_TX_DISCARD_IRQ, > + .irq_name = "msg-tx-discarded", > + }, > + { > + .virq = PMIC_PDPHY_MSG_RX_DISCARD_IRQ, > + .irq_name = "msg-rx-discarded", > + }, > + }, > + .nr_irqs = 7, > +}; > + > +static struct pmic_typec_port_resources pm8150b_port_res = { > + .irq_params = { > + { > + .irq_name = "vpd-detect", > + .virq = PMIC_TYPEC_VPD_IRQ, > + }, > + > + { > + .irq_name = "cc-state-change", > + .virq = PMIC_TYPEC_CC_STATE_IRQ, > + }, > + { > + .irq_name = "vconn-oc", > + .virq = PMIC_TYPEC_VCONN_OC_IRQ, > + }, > + > + { > + .irq_name = "vbus-change", > + .virq = PMIC_TYPEC_VBUS_IRQ, > + }, > + > + { > + .irq_name = "attach-detach", > + .virq = PMIC_TYPEC_ATTACH_DETACH_IRQ, > + }, > + { > + .irq_name = "legacy-cable-detect", > + .virq = PMIC_TYPEC_LEGACY_CABLE_IRQ, > + }, > + > + { > + .irq_name = "try-snk-src-detect", > + .virq = PMIC_TYPEC_TRY_SNK_SRC_IRQ, > + }, > + }, > + .nr_irqs = 7, > +}; > + > +struct pmic_typec_resources pm8150b_typec_res = { > + .pdphy_res = &pm8150b_pdphy_res, > + .port_res = &pm8150b_port_res, > +}; > + > +static const struct of_device_id qcom_pmic_typec_table[] = { > + { .compatible = "qcom,pm8150b-typec", .data = &pm8150b_typec_res }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, qcom_pmic_typec_table); > + > +static struct platform_driver qcom_pmic_typec_platform_driver = { > + .driver = { > + .name = "qcom,pmic-typec", > + .of_match_table = qcom_pmic_typec_table, > + }, > + .probe = qcom_pmic_typec_probe, > + .remove = qcom_pmic_typec_remove, > +}; > + > +static int __init qcom_pmic_typec_module_init(void) > +{ > + int ret; > + > + ret = platform_driver_register(&qcom_pmic_typec_platform_driver); > + if (ret) > + return ret; > + > + return 0; > +} > +module_init(qcom_pmic_typec_module_init); > + > +static void __exit qcom_pmic_typec_module_exit(void) > +{ > + platform_driver_unregister(&qcom_pmic_typec_platform_driver); > +} > +module_exit(qcom_pmic_typec_module_exit); > + > +MODULE_DESCRIPTION("QCOM PMIC USB Type-C Port Manager Driver"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c > new file mode 100644 > index 0000000000000..02f437b068bea > --- /dev/null > +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c > @@ -0,0 +1,528 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2023, Linaro Ltd. All rights reserved. > + */ > + > +#include <linux/err.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.h> > +#include <linux/mod_devicetable.h> > +#include <linux/module.h> > +#include <linux/of_device.h> > +#include <linux/of_irq.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > +#include <linux/regulator/consumer.h> > +#include <linux/slab.h> > +#include <linux/usb/pd.h> > +#include <linux/usb/tcpm.h> > +#include "qcom_pmic_typec_pdphy.h" > + > +struct pmic_typec_pdphy_irq_data { > + int virq; > + int irq; > + struct pmic_typec_pdphy *pmic_typec_pdphy; > +}; > + > +struct pmic_typec_pdphy { > + struct device *dev; > + struct tcpm_port *tcpm_port; > + struct regmap *regmap; > + u32 base; > + > + unsigned int nr_irqs; > + struct pmic_typec_pdphy_irq_data *irq_data; > + > + struct work_struct reset_work; > + struct work_struct receive_work; > + struct regulator *vdd_pdphy; > + spinlock_t lock; /* Register atomicity */ > +}; > + > +static void qcom_pmic_typec_pdphy_reset_on(struct pmic_typec_pdphy *pmic_typec_pdphy) > +{ > + struct device *dev = pmic_typec_pdphy->dev; > + int ret; > + > + /* Terminate TX */ > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, 0); > + if (ret) > + goto err; > + > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_FRAME_FILTER_REG, 0); > + if (ret) > + goto err; > + > + return; > +err: > + dev_err(dev, "pd_reset_on error\n"); > +} > + > +static void qcom_pmic_typec_pdphy_reset_off(struct pmic_typec_pdphy *pmic_typec_pdphy) > +{ > + struct device *dev = pmic_typec_pdphy->dev; > + int ret; > + > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_FRAME_FILTER_REG, > + FRAME_FILTER_EN_SOP | FRAME_FILTER_EN_HARD_RESET); > + if (ret) > + dev_err(dev, "pd_reset_off error\n"); > +} > + > +static void qcom_pmic_typec_pdphy_sig_reset_work(struct work_struct *work) > +{ > + struct pmic_typec_pdphy *pmic_typec_pdphy = container_of(work, struct pmic_typec_pdphy, > + reset_work); > + unsigned long flags; > + > + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); > + > + qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy); > + qcom_pmic_typec_pdphy_reset_off(pmic_typec_pdphy); > + > + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); > + > + tcpm_pd_hard_reset(pmic_typec_pdphy->tcpm_port); > +} > + > +static int > +qcom_pmic_typec_pdphy_clear_tx_control_reg(struct pmic_typec_pdphy *pmic_typec_pdphy) > +{ > + struct device *dev = pmic_typec_pdphy->dev; > + unsigned int val; > + int ret; > + > + /* Clear TX control register */ > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, 0); > + if (ret) > + goto done; > + > + /* Perform readback to ensure sufficient delay for command to latch */ > + ret = regmap_read(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, &val); > + > +done: > + if (ret) > + dev_err(dev, "pd_clear_tx_control_reg: clear tx flag\n"); > + > + return ret; > +} > + > +static int > +qcom_pmic_typec_pdphy_pd_transmit_signal(struct pmic_typec_pdphy *pmic_typec_pdphy, > + enum tcpm_transmit_type type, > + unsigned int negotiated_rev) > +{ > + struct device *dev = pmic_typec_pdphy->dev; > + unsigned int val; > + unsigned long flags; > + int ret; > + > + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); > + > + /* Clear TX control register */ > + ret = qcom_pmic_typec_pdphy_clear_tx_control_reg(pmic_typec_pdphy); > + if (ret) > + goto done; > + > + val = TX_CONTROL_SEND_SIGNAL; > + if (negotiated_rev == PD_REV30) > + val |= TX_CONTROL_RETRY_COUNT(2); > + else > + val |= TX_CONTROL_RETRY_COUNT(3); > + > + if (type == TCPC_TX_CABLE_RESET || type == TCPC_TX_HARD_RESET) > + val |= TX_CONTROL_FRAME_TYPE(1); > + > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, val); > + > +done: > + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); > + > + dev_vdbg(dev, "pd_transmit_signal: type %d negotiate_rev %d send %d\n", > + type, negotiated_rev, ret); > + > + return ret; > +} > + > +static int > +qcom_pmic_typec_pdphy_pd_transmit_payload(struct pmic_typec_pdphy *pmic_typec_pdphy, > + enum tcpm_transmit_type type, > + const struct pd_message *msg, > + unsigned int negotiated_rev) > +{ > + struct device *dev = pmic_typec_pdphy->dev; > + unsigned int val, hdr_len, txbuf_len, txsize_len; > + unsigned long flags; > + int ret; > + > + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); > + > + ret = regmap_read(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG, > + &val); > + if (ret) > + goto done; > + > + if (val) { > + dev_err(dev, "pd_transmit_payload: RX message pending\n"); > + ret = -EBUSY; > + goto done; > + } > + > + /* Clear TX control register */ > + ret = qcom_pmic_typec_pdphy_clear_tx_control_reg(pmic_typec_pdphy); > + if (ret) > + goto done; > + > + hdr_len = sizeof(msg->header); > + txbuf_len = pd_header_cnt_le(msg->header) * 4; > + txsize_len = hdr_len + txbuf_len - 1; > + > + /* Write message header sizeof(u16) to USB_PDPHY_TX_BUFFER_HDR_REG */ > + ret = regmap_bulk_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_TX_BUFFER_HDR_REG, > + &msg->header, hdr_len); > + if (ret) > + goto done; > + > + /* Write payload to USB_PDPHY_TX_BUFFER_DATA_REG for txbuf_len */ > + if (txbuf_len) { > + ret = regmap_bulk_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_TX_BUFFER_DATA_REG, > + &msg->payload, txbuf_len); > + if (ret) > + goto done; > + } > + > + /* Write total length ((header + data) - 1) to USB_PDPHY_TX_SIZE_REG */ > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_TX_SIZE_REG, > + txsize_len); > + if (ret) > + goto done; > + > + /* Clear TX control register */ > + ret = qcom_pmic_typec_pdphy_clear_tx_control_reg(pmic_typec_pdphy); > + if (ret) > + goto done; > + > + /* Initiate transmit with retry count as indicated by PD revision */ > + val = TX_CONTROL_FRAME_TYPE(type) | TX_CONTROL_SEND_MSG; > + if (pd_header_rev(msg->header) == PD_REV30) > + val |= TX_CONTROL_RETRY_COUNT(2); > + else > + val |= TX_CONTROL_RETRY_COUNT(3); > + > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, val); > + > +done: > + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); > + > + if (ret) { > + dev_err(dev, "pd_transmit_payload: %d hdr %*ph data %*ph ret %d\n", > + ret, hdr_len, &msg->header, txbuf_len, &msg->payload, ret); > + } > + > + return ret; > +} > + > +int qcom_pmic_typec_pdphy_pd_transmit(struct pmic_typec_pdphy *pmic_typec_pdphy, > + enum tcpm_transmit_type type, > + const struct pd_message *msg, > + unsigned int negotiated_rev) > +{ > + struct device *dev = pmic_typec_pdphy->dev; > + int ret; > + > + if (msg) { > + ret = qcom_pmic_typec_pdphy_pd_transmit_payload(pmic_typec_pdphy, > + type, msg, > + negotiated_rev); > + } else { > + ret = qcom_pmic_typec_pdphy_pd_transmit_signal(pmic_typec_pdphy, > + type, > + negotiated_rev); > + } > + > + if (ret) > + dev_dbg(dev, "pd_transmit: type %x result %d\n", type, ret); > + > + return ret; > +} > + > +static void qcom_pmic_typec_pdphy_pd_receive(struct pmic_typec_pdphy *pmic_typec_pdphy) > +{ > + struct device *dev = pmic_typec_pdphy->dev; > + struct pd_message msg; > + unsigned int size, rx_status; > + unsigned long flags; > + int ret; > + > + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); > + > + ret = regmap_read(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_RX_SIZE_REG, &size); > + if (ret) > + goto done; > + > + /* If we received a subsequent RX sig this value can be zero */ > + if ((size < 1 || size > sizeof(msg.payload))) { > + dev_dbg(dev, "pd_receive: invalid size %d\n", size); > + goto done; > + } > + > + size += 1; > + ret = regmap_read(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_RX_STATUS_REG, > + &rx_status); > + > + if (ret) > + goto done; > + > + ret = regmap_bulk_read(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_RX_BUFFER_REG, > + (u8 *)&msg, size); > + if (ret) > + goto done; > + > + /* Return ownership of RX buffer to hardware */ > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG, 0); > + > +done: > + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); > + > + if (!ret) { > + dev_vdbg(dev, "pd_receive: handing %d bytes to tcpm\n", size); > + tcpm_pd_receive(pmic_typec_pdphy->tcpm_port, &msg); > + } > +} > + > +static irqreturn_t qcom_pmic_typec_pdphy_isr(int irq, void *dev_id) > +{ > + struct pmic_typec_pdphy_irq_data *irq_data = dev_id; > + struct pmic_typec_pdphy *pmic_typec_pdphy = irq_data->pmic_typec_pdphy; > + struct device *dev = pmic_typec_pdphy->dev; > + > + switch (irq_data->virq) { > + case PMIC_PDPHY_SIG_TX_IRQ: > + dev_err(dev, "isr: tx_sig\n"); > + break; > + case PMIC_PDPHY_SIG_RX_IRQ: > + schedule_work(&pmic_typec_pdphy->reset_work); > + break; > + case PMIC_PDPHY_MSG_TX_IRQ: > + tcpm_pd_transmit_complete(pmic_typec_pdphy->tcpm_port, > + TCPC_TX_SUCCESS); > + break; > + case PMIC_PDPHY_MSG_RX_IRQ: > + qcom_pmic_typec_pdphy_pd_receive(pmic_typec_pdphy); > + break; > + case PMIC_PDPHY_MSG_TX_FAIL_IRQ: > + tcpm_pd_transmit_complete(pmic_typec_pdphy->tcpm_port, > + TCPC_TX_FAILED); > + break; > + case PMIC_PDPHY_MSG_TX_DISCARD_IRQ: > + tcpm_pd_transmit_complete(pmic_typec_pdphy->tcpm_port, > + TCPC_TX_DISCARDED); > + break; > + } > + > + return IRQ_HANDLED; > +} > + > +int qcom_pmic_typec_pdphy_set_pd_rx(struct pmic_typec_pdphy *pmic_typec_pdphy, bool on) > +{ > + unsigned long flags; > + int ret; > + > + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); > + > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG, !on); > + > + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); > + > + dev_dbg(pmic_typec_pdphy->dev, "set_pd_rx: %s\n", on ? "on" : "off"); > + > + return ret; > +} > + > +int qcom_pmic_typec_pdphy_set_roles(struct pmic_typec_pdphy *pmic_typec_pdphy, > + bool data_role_host, bool power_role_src) > +{ > + struct device *dev = pmic_typec_pdphy->dev; > + unsigned long flags; > + int ret; > + > + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); > + > + ret = regmap_update_bits(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_MSG_CONFIG_REG, > + MSG_CONFIG_PORT_DATA_ROLE | > + MSG_CONFIG_PORT_POWER_ROLE, > + data_role_host << 3 | power_role_src << 2); > + > + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); > + > + dev_dbg(dev, "pdphy_set_roles: data_role_host=%d power_role_src=%d\n", > + data_role_host, power_role_src); > + > + return ret; > +} > + > +static int qcom_pmic_typec_pdphy_enable(struct pmic_typec_pdphy *pmic_typec_pdphy) > +{ > + struct device *dev = pmic_typec_pdphy->dev; > + int ret; > + > + ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy); > + if (ret) > + return ret; > + > + /* PD 2.0, DR=TYPEC_DEVICE, PR=TYPEC_SINK */ > + ret = regmap_update_bits(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_MSG_CONFIG_REG, > + MSG_CONFIG_SPEC_REV_MASK, PD_REV20); > + if (ret) > + goto done; > + > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0); > + if (ret) > + goto done; > + > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, > + CONTROL_ENABLE); > + if (ret) > + goto done; > + > + qcom_pmic_typec_pdphy_reset_off(pmic_typec_pdphy); > +done: > + if (ret) { > + regulator_disable(pmic_typec_pdphy->vdd_pdphy); > + dev_err(dev, "pdphy_enable fail %d\n", ret); > + } > + > + return ret; > +} > + > +static int qcom_pmic_typec_pdphy_disable(struct pmic_typec_pdphy *pmic_typec_pdphy) > +{ > + int ret; > + > + qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy); > + > + ret = regmap_write(pmic_typec_pdphy->regmap, > + pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0); > + > + regulator_disable(pmic_typec_pdphy->vdd_pdphy); > + > + return ret; > +} > + > +static int pmic_typec_pdphy_reset(struct pmic_typec_pdphy *pmic_typec_pdphy) > +{ > + int ret; > + > + ret = qcom_pmic_typec_pdphy_disable(pmic_typec_pdphy); > + if (ret) > + goto done; > + > + usleep_range(400, 500); > + ret = qcom_pmic_typec_pdphy_enable(pmic_typec_pdphy); > +done: > + return ret; > +} > + > +int qcom_pmic_typec_pdphy_start(struct pmic_typec_pdphy *pmic_typec_pdphy, > + struct tcpm_port *tcpm_port) > +{ > + int i; > + int ret; > + > + pmic_typec_pdphy->tcpm_port = tcpm_port; > + > + ret = pmic_typec_pdphy_reset(pmic_typec_pdphy); > + if (ret) > + return ret; > + > + for (i = 0; i < pmic_typec_pdphy->nr_irqs; i++) > + enable_irq(pmic_typec_pdphy->irq_data[i].irq); > + > + return 0; > +} > + > +void qcom_pmic_typec_pdphy_stop(struct pmic_typec_pdphy *pmic_typec_pdphy) > +{ > + int i; > + > + for (i = 0; i < pmic_typec_pdphy->nr_irqs; i++) > + disable_irq(pmic_typec_pdphy->irq_data[i].irq); > + > + qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy); > +} > + > +struct pmic_typec_pdphy *qcom_pmic_typec_pdphy_alloc(struct device *dev) > +{ > + return devm_kzalloc(dev, sizeof(struct pmic_typec_pdphy), GFP_KERNEL); > +} > + > +int qcom_pmic_typec_pdphy_probe(struct platform_device *pdev, > + struct pmic_typec_pdphy *pmic_typec_pdphy, > + struct pmic_typec_pdphy_resources *res, > + struct regmap *regmap, > + u32 base) > +{ > + struct device *dev = &pdev->dev; > + struct pmic_typec_pdphy_irq_data *irq_data; > + int i, ret, irq; > + > + if (!res->nr_irqs || res->nr_irqs > PMIC_PDPHY_MAX_IRQS) > + return -EINVAL; > + > + irq_data = devm_kzalloc(dev, sizeof(*irq_data) * res->nr_irqs, > + GFP_KERNEL); > + if (!irq_data) > + return -ENOMEM; > + > + pmic_typec_pdphy->vdd_pdphy = devm_regulator_get(dev, "vdd-pdphy"); > + if (IS_ERR(pmic_typec_pdphy->vdd_pdphy)) > + return PTR_ERR(pmic_typec_pdphy->vdd_pdphy); > + > + pmic_typec_pdphy->dev = dev; > + pmic_typec_pdphy->base = base; > + pmic_typec_pdphy->regmap = regmap; > + pmic_typec_pdphy->nr_irqs = res->nr_irqs; > + pmic_typec_pdphy->irq_data = irq_data; > + spin_lock_init(&pmic_typec_pdphy->lock); > + INIT_WORK(&pmic_typec_pdphy->reset_work, qcom_pmic_typec_pdphy_sig_reset_work); > + > + for (i = 0; i < res->nr_irqs; i++, irq_data++) { > + irq = platform_get_irq_byname(pdev, res->irq_params[i].irq_name); > + if (irq < 0) > + return irq; > + > + irq_data->pmic_typec_pdphy = pmic_typec_pdphy; > + irq_data->irq = irq; > + irq_data->virq = res->irq_params[i].virq; > + > + ret = devm_request_threaded_irq(dev, irq, NULL, > + qcom_pmic_typec_pdphy_isr, > + IRQF_ONESHOT | IRQF_NO_AUTOEN, > + res->irq_params[i].irq_name, > + irq_data); > + if (ret) > + return ret; > + } > + > + return 0; > +} > diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h > new file mode 100644 > index 0000000000000..ebd33c9ae0606 > --- /dev/null > +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h > @@ -0,0 +1,115 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. > + * Copyright (c) 2023, Linaro Ltd. All rights reserved. > + */ > +#ifndef __QCOM_PMIC_PDPHY_H__ > +#define __QCOM_PMIC_PDPHY_H__ > + > +#define USB_PDPHY_MAX_DATA_OBJ_LEN 28 > +#define USB_PDPHY_MSG_HDR_LEN 2 > + > +/* PD PHY register offsets and bit fields */ > +#define USB_PDPHY_MSG_CONFIG_REG 0x40 > +#define MSG_CONFIG_PORT_DATA_ROLE BIT(3) > +#define MSG_CONFIG_PORT_POWER_ROLE BIT(2) > +#define MSG_CONFIG_SPEC_REV_MASK (BIT(1) | BIT(0)) > + > +#define USB_PDPHY_EN_CONTROL_REG 0x46 > +#define CONTROL_ENABLE BIT(0) > + > +#define USB_PDPHY_RX_STATUS_REG 0x4A > +#define RX_FRAME_TYPE (BIT(0) | BIT(1) | BIT(2)) > + > +#define USB_PDPHY_FRAME_FILTER_REG 0x4C > +#define FRAME_FILTER_EN_HARD_RESET BIT(5) > +#define FRAME_FILTER_EN_SOP BIT(0) > + > +#define USB_PDPHY_TX_SIZE_REG 0x42 > +#define TX_SIZE_MASK 0xF > + > +#define USB_PDPHY_TX_CONTROL_REG 0x44 > +#define TX_CONTROL_RETRY_COUNT(n) (((n) & 0x3) << 5) > +#define TX_CONTROL_FRAME_TYPE(n) (((n) & 0x7) << 2) > +#define TX_CONTROL_FRAME_TYPE_CABLE_RESET (0x1 << 2) > +#define TX_CONTROL_SEND_SIGNAL BIT(1) > +#define TX_CONTROL_SEND_MSG BIT(0) > + > +#define USB_PDPHY_RX_SIZE_REG 0x48 > + > +#define USB_PDPHY_RX_ACKNOWLEDGE_REG 0x4B > +#define RX_BUFFER_TOKEN BIT(0) > + > +#define USB_PDPHY_BIST_MODE_REG 0x4E > +#define BIST_MODE_MASK 0xF > +#define BIST_ENABLE BIT(7) > +#define PD_MSG_BIST 0x3 > +#define PD_BIST_TEST_DATA_MODE 0x8 > + > +#define USB_PDPHY_TX_BUFFER_HDR_REG 0x60 > +#define USB_PDPHY_TX_BUFFER_DATA_REG 0x62 > + > +#define USB_PDPHY_RX_BUFFER_REG 0x80 > + > +/* VDD regulator */ > +#define VDD_PDPHY_VOL_MIN 2800000 /* uV */ > +#define VDD_PDPHY_VOL_MAX 3300000 /* uV */ > +#define VDD_PDPHY_HPM_LOAD 3000 /* uA */ > + > +/* Message Spec Rev field */ > +#define PD_MSG_HDR_REV(hdr) (((hdr) >> 6) & 3) > + > +/* timers */ > +#define RECEIVER_RESPONSE_TIME 15 /* tReceiverResponse */ > +#define HARD_RESET_COMPLETE_TIME 5 /* tHardResetComplete */ > + > +/* Interrupt numbers */ > +#define PMIC_PDPHY_SIG_TX_IRQ 0x0 > +#define PMIC_PDPHY_SIG_RX_IRQ 0x1 > +#define PMIC_PDPHY_MSG_TX_IRQ 0x2 > +#define PMIC_PDPHY_MSG_RX_IRQ 0x3 > +#define PMIC_PDPHY_MSG_TX_FAIL_IRQ 0x4 > +#define PMIC_PDPHY_MSG_TX_DISCARD_IRQ 0x5 > +#define PMIC_PDPHY_MSG_RX_DISCARD_IRQ 0x6 > +#define PMIC_PDPHY_FR_SWAP_IRQ 0x7 > + > +/* Resources */ > +#define PMIC_PDPHY_MAX_IRQS 0x08 > + > +struct pmic_typec_pdphy_irq_params { > + int virq; > + char *irq_name; > +}; > + > +struct pmic_typec_pdphy_resources { > + unsigned int nr_irqs; > + struct pmic_typec_pdphy_irq_params irq_params[PMIC_PDPHY_MAX_IRQS]; > +}; > + > +/* API */ > +struct pmic_typec_pdphy; > + > +struct pmic_typec_pdphy *qcom_pmic_typec_pdphy_alloc(struct device *dev); > + > +int qcom_pmic_typec_pdphy_probe(struct platform_device *pdev, > + struct pmic_typec_pdphy *pmic_typec_pdphy, > + struct pmic_typec_pdphy_resources *res, > + struct regmap *regmap, > + u32 base); > + > +int qcom_pmic_typec_pdphy_start(struct pmic_typec_pdphy *pmic_typec_pdphy, > + struct tcpm_port *tcpm_port); > + > +void qcom_pmic_typec_pdphy_stop(struct pmic_typec_pdphy *pmic_typec_pdphy); > + > +int qcom_pmic_typec_pdphy_set_roles(struct pmic_typec_pdphy *pmic_typec_pdphy, > + bool power_role_src, bool data_role_host); > + > +int qcom_pmic_typec_pdphy_set_pd_rx(struct pmic_typec_pdphy *pmic_typec_pdphy, bool on); > + > +int qcom_pmic_typec_pdphy_pd_transmit(struct pmic_typec_pdphy *pmic_typec_pdphy, > + enum tcpm_transmit_type type, > + const struct pd_message *msg, > + unsigned int negotiated_rev); > + > +#endif /* __QCOM_PMIC_TYPEC_PDPHY_H__ */ > diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c > new file mode 100644 > index 0000000000000..42c956b6a1a1d > --- /dev/null > +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c > @@ -0,0 +1,560 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2023, Linaro Ltd. All rights reserved. > + */ > + > +#include <linux/delay.h> > +#include <linux/err.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.h> > +#include <linux/mod_devicetable.h> > +#include <linux/module.h> > +#include <linux/of_device.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > +#include <linux/regulator/consumer.h> > +#include <linux/slab.h> > +#include <linux/usb/tcpm.h> > +#include <linux/usb/typec_mux.h> > +#include <linux/workqueue.h> > +#include "qcom_pmic_typec_port.h" > + > +struct pmic_typec_port_irq_data { > + int virq; > + int irq; > + struct pmic_typec_port *pmic_typec_port; > +}; > + > +struct pmic_typec_port { > + struct device *dev; > + struct tcpm_port *tcpm_port; > + struct regmap *regmap; > + u32 base; > + unsigned int nr_irqs; > + struct pmic_typec_port_irq_data *irq_data; > + > + struct regulator *vdd_vbus; > + > + int cc; > + bool debouncing_cc; > + struct delayed_work cc_debounce_dwork; > + > + spinlock_t lock; /* Register atomicity */ > +}; > + > +static const char * const typec_cc_status_name[] = { > + [TYPEC_CC_OPEN] = "Open", > + [TYPEC_CC_RA] = "Ra", > + [TYPEC_CC_RD] = "Rd", > + [TYPEC_CC_RP_DEF] = "Rp-def", > + [TYPEC_CC_RP_1_5] = "Rp-1.5", > + [TYPEC_CC_RP_3_0] = "Rp-3.0", > +}; > + > +static const char *rp_unknown = "unknown"; > + > +static const char *cc_to_name(enum typec_cc_status cc) > +{ > + if (cc > TYPEC_CC_RP_3_0) > + return rp_unknown; > + > + return typec_cc_status_name[cc]; > +} > + > +static const char * const rp_sel_name[] = { > + [TYPEC_SRC_RP_SEL_80UA] = "Rp-def-80uA", > + [TYPEC_SRC_RP_SEL_180UA] = "Rp-1.5-180uA", > + [TYPEC_SRC_RP_SEL_330UA] = "Rp-3.0-330uA", > +}; > + > +static const char *rp_sel_to_name(int rp_sel) > +{ > + if (rp_sel > TYPEC_SRC_RP_SEL_330UA) > + return rp_unknown; > + > + return rp_sel_name[rp_sel]; > +} > + > +#define misc_to_cc(msic) !!(misc & CC_ORIENTATION) ? "cc1" : "cc2" > +#define misc_to_vconn(msic) !!(misc & CC_ORIENTATION) ? "cc2" : "cc1" > + > +static void qcom_pmic_typec_port_cc_debounce(struct work_struct *work) > +{ > + struct pmic_typec_port *pmic_typec_port = > + container_of(work, struct pmic_typec_port, cc_debounce_dwork.work); > + unsigned long flags; > + > + spin_lock_irqsave(&pmic_typec_port->lock, flags); > + pmic_typec_port->debouncing_cc = false; > + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); > + > + dev_dbg(pmic_typec_port->dev, "Debounce cc complete\n"); > +} > + > +static irqreturn_t pmic_typec_port_isr(int irq, void *dev_id) > +{ > + struct pmic_typec_port_irq_data *irq_data = dev_id; > + struct pmic_typec_port *pmic_typec_port = irq_data->pmic_typec_port; > + u32 misc_stat; > + bool vbus_change = false; > + bool cc_change = false; > + unsigned long flags; > + int ret; > + > + spin_lock_irqsave(&pmic_typec_port->lock, flags); > + > + ret = regmap_read(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, > + &misc_stat); > + if (ret) > + goto done; > + > + switch (irq_data->virq) { > + case PMIC_TYPEC_VBUS_IRQ: > + /* Incoming vbus assert/de-assert detect */ > + vbus_change = true; > + break; > + case PMIC_TYPEC_CC_STATE_IRQ: > + if (!pmic_typec_port->debouncing_cc) > + cc_change = true; > + break; > + case PMIC_TYPEC_ATTACH_DETACH_IRQ: > + if (!pmic_typec_port->debouncing_cc) > + cc_change = true; > + break; > + } > + > +done: > + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); > + > + if (vbus_change) > + tcpm_vbus_change(pmic_typec_port->tcpm_port); > + > + if (cc_change) > + tcpm_cc_change(pmic_typec_port->tcpm_port); > + > + return IRQ_HANDLED; > +} > + > +int qcom_pmic_typec_port_get_vbus(struct pmic_typec_port *pmic_typec_port) > +{ > + struct device *dev = pmic_typec_port->dev; > + unsigned int misc; > + int ret; > + > + ret = regmap_read(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, > + &misc); > + if (ret) > + misc = 0; > + > + dev_dbg(dev, "get_vbus: 0x%08x detect %d\n", misc, !!(misc & TYPEC_VBUS_DETECT)); > + > + return !!(misc & TYPEC_VBUS_DETECT); > +} > + > +int qcom_pmic_typec_port_set_vbus(struct pmic_typec_port *pmic_typec_port, bool on) > +{ > + u32 sm_stat; > + u32 val; > + int ret; > + > + if (on) { > + ret = regulator_enable(pmic_typec_port->vdd_vbus); > + if (ret) > + return ret; > + > + val = TYPEC_SM_VBUS_VSAFE5V; > + } else { > + ret = regulator_disable(pmic_typec_port->vdd_vbus); > + if (ret) > + return ret; > + > + val = TYPEC_SM_VBUS_VSAFE0V; > + } > + > + /* Poll waiting for transition to required vSafe5V or vSafe0V */ > + ret = regmap_read_poll_timeout(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_SM_STATUS_REG, > + sm_stat, sm_stat & val, > + 100, 250000); > + if (ret) > + dev_warn(pmic_typec_port->dev, "vbus vsafe%dv fail\n", on ? 5 : 0); > + > + return 0; > +} > + > +int qcom_pmic_typec_port_get_cc(struct pmic_typec_port *pmic_typec_port, > + enum typec_cc_status *cc1, > + enum typec_cc_status *cc2) > +{ > + struct device *dev = pmic_typec_port->dev; > + unsigned int misc, val; > + bool attached; > + int ret = 0; > + > + ret = regmap_read(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, &misc); > + if (ret) > + goto done; > + > + attached = !!(misc & CC_ATTACHED); > + > + if (pmic_typec_port->debouncing_cc) { > + ret = -EBUSY; > + goto done; > + } > + > + *cc1 = TYPEC_CC_OPEN; > + *cc2 = TYPEC_CC_OPEN; > + > + if (!(attached)) > + goto done; > + > + if (misc & SNK_SRC_MODE) { > + ret = regmap_read(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_SRC_STATUS_REG, > + &val); > + if (ret) > + goto done; > + switch (val & DETECTED_SRC_TYPE_MASK) { > + case SRC_RD_OPEN: > + val = TYPEC_CC_RD; > + break; > + case SRC_RD_RA_VCONN: > + val = TYPEC_CC_RD; > + *cc1 = TYPEC_CC_RA; > + *cc2 = TYPEC_CC_RA; > + break; > + default: > + dev_warn(dev, "unexpected src status %.2x\n", val); > + val = TYPEC_CC_RD; > + break; > + } > + } else { > + ret = regmap_read(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_SNK_STATUS_REG, > + &val); > + if (ret) > + goto done; > + switch (val & DETECTED_SNK_TYPE_MASK) { > + case SNK_RP_STD: > + val = TYPEC_CC_RP_DEF; > + break; > + case SNK_RP_1P5: > + val = TYPEC_CC_RP_1_5; > + break; > + case SNK_RP_3P0: > + val = TYPEC_CC_RP_3_0; > + break; > + default: > + dev_warn(dev, "unexpected snk status %.2x\n", val); > + val = TYPEC_CC_RP_DEF; > + break; > + } > + val = TYPEC_CC_RP_DEF; > + } > + > + if (misc & CC_ORIENTATION) > + *cc2 = val; > + else > + *cc1 = val; > + > +done: > + dev_dbg(dev, "get_cc: misc 0x%08x cc1 0x%08x %s cc2 0x%08x %s attached %d cc=%s\n", > + misc, *cc1, cc_to_name(*cc1), *cc2, cc_to_name(*cc2), attached, > + misc_to_cc(misc)); > + > + return ret; > +} > + > +static void qcom_pmic_set_cc_debounce(struct pmic_typec_port *pmic_typec_port) > +{ > + pmic_typec_port->debouncing_cc = true; > + schedule_delayed_work(&pmic_typec_port->cc_debounce_dwork, > + msecs_to_jiffies(2)); > +} > + > +int qcom_pmic_typec_port_set_cc(struct pmic_typec_port *pmic_typec_port, > + enum typec_cc_status cc) > +{ > + struct device *dev = pmic_typec_port->dev; > + unsigned int mode, currsrc; > + unsigned int misc; > + unsigned long flags; > + int ret; > + > + spin_lock_irqsave(&pmic_typec_port->lock, flags); > + > + ret = regmap_read(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, > + &misc); > + if (ret) > + goto done; > + > + mode = EN_SRC_ONLY; > + > + switch (cc) { > + case TYPEC_CC_OPEN: > + currsrc = TYPEC_SRC_RP_SEL_80UA; > + break; > + case TYPEC_CC_RP_DEF: > + currsrc = TYPEC_SRC_RP_SEL_80UA; > + break; > + case TYPEC_CC_RP_1_5: > + currsrc = TYPEC_SRC_RP_SEL_180UA; > + break; > + case TYPEC_CC_RP_3_0: > + currsrc = TYPEC_SRC_RP_SEL_330UA; > + break; > + case TYPEC_CC_RD: > + currsrc = TYPEC_SRC_RP_SEL_80UA; > + mode = EN_SNK_ONLY; > + break; > + default: > + dev_warn(dev, "unexpected set_cc %d\n", cc); > + ret = -EINVAL; > + goto done; > + } > + > + if (mode == EN_SRC_ONLY) { > + ret = regmap_write(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_CURRSRC_CFG_REG, > + currsrc); > + if (ret) > + goto done; > + } > + > + pmic_typec_port->cc = cc; > + qcom_pmic_set_cc_debounce(pmic_typec_port); > + ret = 0; > + > +done: > + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); > + > + dev_dbg(dev, "set_cc: currsrc=%x %s mode %s debounce %d attached %d cc=%s\n", > + currsrc, rp_sel_to_name(currsrc), > + mode == EN_SRC_ONLY ? "EN_SRC_ONLY" : "EN_SNK_ONLY", > + pmic_typec_port->debouncing_cc, !!(misc & CC_ATTACHED), > + misc_to_cc(misc)); > + > + return ret; > +} > + > +int qcom_pmic_typec_port_set_vconn(struct pmic_typec_port *pmic_typec_port, bool on) > +{ > + struct device *dev = pmic_typec_port->dev; > + unsigned int orientation, misc, mask, value; > + unsigned long flags; > + int ret; > + > + spin_lock_irqsave(&pmic_typec_port->lock, flags); > + > + ret = regmap_read(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, &misc); > + if (ret) > + goto done; > + > + /* Set VCONN on the inversion of the active CC channel */ > + orientation = (misc & CC_ORIENTATION) ? 0 : VCONN_EN_ORIENTATION; > + if (on) { > + mask = VCONN_EN_ORIENTATION | VCONN_EN_VALUE; > + value = orientation | VCONN_EN_VALUE | VCONN_EN_SRC; > + } else { > + mask = VCONN_EN_VALUE; > + value = 0; > + } > + > + ret = regmap_update_bits(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_VCONN_CONTROL_REG, > + mask, value); > +done: > + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); > + > + dev_dbg(dev, "set_vconn: orientation %d control 0x%08x state %s cc %s vconn %s\n", > + orientation, value, on ? "on" : "off", misc_to_vconn(misc), misc_to_cc(misc)); > + > + return ret; > +} > + > +int qcom_pmic_typec_port_start_toggling(struct pmic_typec_port *pmic_typec_port, > + enum typec_port_type port_type, > + enum typec_cc_status cc) > +{ > + struct device *dev = pmic_typec_port->dev; > + unsigned int misc; > + u8 mode = 0; > + unsigned long flags; > + int ret; > + > + switch (port_type) { > + case TYPEC_PORT_SRC: > + mode = EN_SRC_ONLY; > + break; > + case TYPEC_PORT_SNK: > + mode = EN_SNK_ONLY; > + break; > + case TYPEC_PORT_DRP: > + mode = EN_TRY_SNK; > + break; > + } > + > + spin_lock_irqsave(&pmic_typec_port->lock, flags); > + > + ret = regmap_read(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, &misc); > + if (ret) > + goto done; > + > + dev_dbg(dev, "start_toggling: misc 0x%08x attached %d port_type %d current cc %d new %d\n", > + misc, !!(misc & CC_ATTACHED), port_type, pmic_typec_port->cc, cc); > + > + qcom_pmic_set_cc_debounce(pmic_typec_port); > + > + /* force it to toggle at least once */ > + ret = regmap_write(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_MODE_CFG_REG, > + TYPEC_DISABLE_CMD); > + if (ret) > + goto done; > + > + ret = regmap_write(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_MODE_CFG_REG, > + mode); > +done: > + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); > + > + return ret; > +} > + > +#define TYPEC_INTR_EN_CFG_1_MASK \ > + (TYPEC_LEGACY_CABLE_INT_EN | \ > + TYPEC_NONCOMPLIANT_LEGACY_CABLE_INT_EN | \ > + TYPEC_TRYSOURCE_DETECT_INT_EN | \ > + TYPEC_TRYSINK_DETECT_INT_EN | \ > + TYPEC_CCOUT_DETACH_INT_EN | \ > + TYPEC_CCOUT_ATTACH_INT_EN | \ > + TYPEC_VBUS_DEASSERT_INT_EN | \ > + TYPEC_VBUS_ASSERT_INT_EN) > + > +#define TYPEC_INTR_EN_CFG_2_MASK \ > + (TYPEC_STATE_MACHINE_CHANGE_INT_EN | TYPEC_VBUS_ERROR_INT_EN | \ > + TYPEC_DEBOUNCE_DONE_INT_EN) > + > +int qcom_pmic_typec_port_start(struct pmic_typec_port *pmic_typec_port, > + struct tcpm_port *tcpm_port) > +{ > + int i; > + int mask; > + int ret; > + > + /* Configure interrupt sources */ > + ret = regmap_write(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_INTERRUPT_EN_CFG_1_REG, > + TYPEC_INTR_EN_CFG_1_MASK); > + if (ret) > + goto done; > + > + ret = regmap_write(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_INTERRUPT_EN_CFG_2_REG, > + TYPEC_INTR_EN_CFG_2_MASK); > + if (ret) > + goto done; > + > + /* start in TRY_SNK mode */ > + ret = regmap_write(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_MODE_CFG_REG, EN_TRY_SNK); > + if (ret) > + goto done; > + > + /* Configure VCONN for software control */ > + ret = regmap_update_bits(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_VCONN_CONTROL_REG, > + VCONN_EN_SRC | VCONN_EN_VALUE, VCONN_EN_SRC); > + if (ret) > + goto done; > + > + /* Set CC threshold to 1.6 Volts | tPDdebounce = 10-20ms */ > + mask = SEL_SRC_UPPER_REF | USE_TPD_FOR_EXITING_ATTACHSRC; > + ret = regmap_update_bits(pmic_typec_port->regmap, > + pmic_typec_port->base + TYPEC_EXIT_STATE_CFG_REG, > + mask, mask); > + if (ret) > + goto done; > + > + pmic_typec_port->tcpm_port = tcpm_port; > + > + for (i = 0; i < pmic_typec_port->nr_irqs; i++) > + enable_irq(pmic_typec_port->irq_data[i].irq); > + > +done: > + return ret; > +} > + > +void qcom_pmic_typec_port_stop(struct pmic_typec_port *pmic_typec_port) > +{ > + int i; > + > + for (i = 0; i < pmic_typec_port->nr_irqs; i++) > + disable_irq(pmic_typec_port->irq_data[i].irq); > +} > + > +struct pmic_typec_port *qcom_pmic_typec_port_alloc(struct device *dev) > +{ > + return devm_kzalloc(dev, sizeof(struct pmic_typec_port), GFP_KERNEL); > +} > + > +int qcom_pmic_typec_port_probe(struct platform_device *pdev, > + struct pmic_typec_port *pmic_typec_port, > + struct pmic_typec_port_resources *res, > + struct regmap *regmap, > + u32 base) > +{ > + struct device *dev = &pdev->dev; > + struct pmic_typec_port_irq_data *irq_data; > + int i, ret, irq; > + > + if (!res->nr_irqs || res->nr_irqs > PMIC_TYPEC_MAX_IRQS) > + return -EINVAL; > + > + irq_data = devm_kzalloc(dev, sizeof(*irq_data) * res->nr_irqs, > + GFP_KERNEL); > + if (!irq_data) > + return -ENOMEM; > + > + pmic_typec_port->vdd_vbus = devm_regulator_get(dev, "vdd-vbus"); > + if (IS_ERR(pmic_typec_port->vdd_vbus)) > + return PTR_ERR(pmic_typec_port->vdd_vbus); > + > + pmic_typec_port->dev = dev; > + pmic_typec_port->base = base; > + pmic_typec_port->regmap = regmap; > + pmic_typec_port->nr_irqs = res->nr_irqs; > + pmic_typec_port->irq_data = irq_data; > + spin_lock_init(&pmic_typec_port->lock); > + INIT_DELAYED_WORK(&pmic_typec_port->cc_debounce_dwork, > + qcom_pmic_typec_port_cc_debounce); > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) > + return irq; > + > + for (i = 0; i < res->nr_irqs; i++, irq_data++) { > + irq = platform_get_irq_byname(pdev, > + res->irq_params[i].irq_name); > + if (irq < 0) > + return irq; > + > + irq_data->pmic_typec_port = pmic_typec_port; > + irq_data->irq = irq; > + irq_data->virq = res->irq_params[i].virq; > + ret = devm_request_threaded_irq(dev, irq, NULL, pmic_typec_port_isr, > + IRQF_ONESHOT | IRQF_NO_AUTOEN, > + res->irq_params[i].irq_name, > + irq_data); > + if (ret) > + return ret; > + } > + > + return 0; > +} > diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h > new file mode 100644 > index 0000000000000..5a9c47373c614 > --- /dev/null > +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h > @@ -0,0 +1,194 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. > + * Copyright (c) 2023, Linaro Ltd. All rights reserved. > + */ > +#ifndef __QCOM_PMIC_TYPEC_H__ > +#define __QCOM_PMIC_TYPEC_H__ > + > +#include <linux/usb/tcpm.h> > + > +#define TYPEC_SNK_STATUS_REG 0x06 > +#define DETECTED_SNK_TYPE_MASK GENMASK(6, 0) > +#define SNK_DAM_MASK GENMASK(6, 4) > +#define SNK_DAM_500MA BIT(6) > +#define SNK_DAM_1500MA BIT(5) > +#define SNK_DAM_3000MA BIT(4) > +#define SNK_RP_STD BIT(3) > +#define SNK_RP_1P5 BIT(2) > +#define SNK_RP_3P0 BIT(1) > +#define SNK_RP_SHORT BIT(0) > + > +#define TYPEC_SRC_STATUS_REG 0x08 > +#define DETECTED_SRC_TYPE_MASK GENMASK(4, 0) > +#define SRC_HIGH_BATT BIT(5) > +#define SRC_DEBUG_ACCESS BIT(4) > +#define SRC_RD_OPEN BIT(3) > +#define SRC_RD_RA_VCONN BIT(2) > +#define SRC_RA_OPEN BIT(1) > +#define AUDIO_ACCESS_RA_RA BIT(0) > + > +#define TYPEC_STATE_MACHINE_STATUS_REG 0x09 > +#define TYPEC_ATTACH_DETACH_STATE BIT(5) > + > +#define TYPEC_SM_STATUS_REG 0x0A > +#define TYPEC_SM_VBUS_VSAFE5V BIT(5) > +#define TYPEC_SM_VBUS_VSAFE0V BIT(6) > +#define TYPEC_SM_USBIN_LT_LV BIT(7) > + > +#define TYPEC_MISC_STATUS_REG 0x0B > +#define TYPEC_WATER_DETECTION_STATUS BIT(7) > +#define SNK_SRC_MODE BIT(6) > +#define TYPEC_VBUS_DETECT BIT(5) > +#define TYPEC_VBUS_ERROR_STATUS BIT(4) > +#define TYPEC_DEBOUNCE_DONE BIT(3) > +#define CC_ORIENTATION BIT(1) > +#define CC_ATTACHED BIT(0) > + > +#define LEGACY_CABLE_STATUS_REG 0x0D > +#define TYPEC_LEGACY_CABLE_STATUS BIT(1) > +#define TYPEC_NONCOMP_LEGACY_CABLE_STATUS BIT(0) > + > +#define TYPEC_U_USB_STATUS_REG 0x0F > +#define U_USB_GROUND_NOVBUS BIT(6) > +#define U_USB_GROUND BIT(4) > +#define U_USB_FMB1 BIT(3) > +#define U_USB_FLOAT1 BIT(2) > +#define U_USB_FMB2 BIT(1) > +#define U_USB_FLOAT2 BIT(0) > + > +#define TYPEC_MODE_CFG_REG 0x44 > +#define TYPEC_TRY_MODE_MASK GENMASK(4, 3) > +#define EN_TRY_SNK BIT(4) > +#define EN_TRY_SRC BIT(3) > +#define TYPEC_POWER_ROLE_CMD_MASK GENMASK(2, 0) > +#define EN_SRC_ONLY BIT(2) > +#define EN_SNK_ONLY BIT(1) > +#define TYPEC_DISABLE_CMD BIT(0) > + > +#define TYPEC_VCONN_CONTROL_REG 0x46 > +#define VCONN_EN_ORIENTATION BIT(2) > +#define VCONN_EN_VALUE BIT(1) > +#define VCONN_EN_SRC BIT(0) > + > +#define TYPEC_CCOUT_CONTROL_REG 0x48 > +#define TYPEC_CCOUT_BUFFER_EN BIT(2) > +#define TYPEC_CCOUT_VALUE BIT(1) > +#define TYPEC_CCOUT_SRC BIT(0) > + > +#define DEBUG_ACCESS_SRC_CFG_REG 0x4C > +#define EN_UNORIENTED_DEBUG_ACCESS_SRC BIT(0) > + > +#define TYPE_C_CRUDE_SENSOR_CFG_REG 0x4e > +#define EN_SRC_CRUDE_SENSOR BIT(1) > +#define EN_SNK_CRUDE_SENSOR BIT(0) > + > +#define TYPEC_EXIT_STATE_CFG_REG 0x50 > +#define BYPASS_VSAFE0V_DURING_ROLE_SWAP BIT(3) > +#define SEL_SRC_UPPER_REF BIT(2) > +#define USE_TPD_FOR_EXITING_ATTACHSRC BIT(1) > +#define EXIT_SNK_BASED_ON_CC BIT(0) > + > +#define TYPEC_CURRSRC_CFG_REG 0x52 > +#define TYPEC_SRC_RP_SEL_330UA BIT(1) > +#define TYPEC_SRC_RP_SEL_180UA BIT(0) > +#define TYPEC_SRC_RP_SEL_80UA 0 > +#define TYPEC_SRC_RP_SEL_MASK GENMASK(1, 0) > + > +#define TYPEC_INTERRUPT_EN_CFG_1_REG 0x5E > +#define TYPEC_LEGACY_CABLE_INT_EN BIT(7) > +#define TYPEC_NONCOMPLIANT_LEGACY_CABLE_INT_EN BIT(6) > +#define TYPEC_TRYSOURCE_DETECT_INT_EN BIT(5) > +#define TYPEC_TRYSINK_DETECT_INT_EN BIT(4) > +#define TYPEC_CCOUT_DETACH_INT_EN BIT(3) > +#define TYPEC_CCOUT_ATTACH_INT_EN BIT(2) > +#define TYPEC_VBUS_DEASSERT_INT_EN BIT(1) > +#define TYPEC_VBUS_ASSERT_INT_EN BIT(0) > + > +#define TYPEC_INTERRUPT_EN_CFG_2_REG 0x60 > +#define TYPEC_SRC_BATT_HPWR_INT_EN BIT(6) > +#define MICRO_USB_STATE_CHANGE_INT_EN BIT(5) > +#define TYPEC_STATE_MACHINE_CHANGE_INT_EN BIT(4) > +#define TYPEC_DEBUG_ACCESS_DETECT_INT_EN BIT(3) > +#define TYPEC_WATER_DETECTION_INT_EN BIT(2) > +#define TYPEC_VBUS_ERROR_INT_EN BIT(1) > +#define TYPEC_DEBOUNCE_DONE_INT_EN BIT(0) > + > +#define TYPEC_DEBOUNCE_OPTION_REG 0x62 > +#define REDUCE_TCCDEBOUNCE_TO_2MS BIT(2) > + > +#define TYPE_C_SBU_CFG_REG 0x6A > +#define SEL_SBU1_ISRC_VAL 0x04 > +#define SEL_SBU2_ISRC_VAL 0x01 > + > +#define TYPEC_U_USB_CFG_REG 0x70 > +#define EN_MICRO_USB_FACTORY_MODE BIT(1) > +#define EN_MICRO_USB_MODE BIT(0) > + > +#define TYPEC_PMI632_U_USB_WATER_PROTECTION_CFG_REG 0x72 > + > +#define TYPEC_U_USB_WATER_PROTECTION_CFG_REG 0x73 > +#define EN_MICRO_USB_WATER_PROTECTION BIT(4) > +#define MICRO_USB_DETECTION_ON_TIME_CFG_MASK GENMASK(3, 2) > +#define MICRO_USB_DETECTION_PERIOD_CFG_MASK GENMASK(1, 0) > + > +#define TYPEC_PMI632_MICRO_USB_MODE_REG 0x73 > +#define MICRO_USB_MODE_ONLY BIT(0) > + > +/* Interrupt numbers */ > +#define PMIC_TYPEC_OR_RID_IRQ 0x0 > +#define PMIC_TYPEC_VPD_IRQ 0x1 > +#define PMIC_TYPEC_CC_STATE_IRQ 0x2 > +#define PMIC_TYPEC_VCONN_OC_IRQ 0x3 > +#define PMIC_TYPEC_VBUS_IRQ 0x4 > +#define PMIC_TYPEC_ATTACH_DETACH_IRQ 0x5 > +#define PMIC_TYPEC_LEGACY_CABLE_IRQ 0x6 > +#define PMIC_TYPEC_TRY_SNK_SRC_IRQ 0x7 > + > +/* Resources */ > +#define PMIC_TYPEC_MAX_IRQS 0x08 > + > +struct pmic_typec_port_irq_params { > + int virq; > + char *irq_name; > +}; > + > +struct pmic_typec_port_resources { > + unsigned int nr_irqs; > + struct pmic_typec_port_irq_params irq_params[PMIC_TYPEC_MAX_IRQS]; > +}; > + > +/* API */ > +struct pmic_typec; > + > +struct pmic_typec_port *qcom_pmic_typec_port_alloc(struct device *dev); > + > +int qcom_pmic_typec_port_probe(struct platform_device *pdev, > + struct pmic_typec_port *pmic_typec_port, > + struct pmic_typec_port_resources *res, > + struct regmap *regmap, > + u32 base); > + > +int qcom_pmic_typec_port_start(struct pmic_typec_port *pmic_typec_port, > + struct tcpm_port *tcpm_port); > + > +void qcom_pmic_typec_port_stop(struct pmic_typec_port *pmic_typec_port); > + > +int qcom_pmic_typec_port_get_cc(struct pmic_typec_port *pmic_typec_port, > + enum typec_cc_status *cc1, > + enum typec_cc_status *cc2); > + > +int qcom_pmic_typec_port_set_cc(struct pmic_typec_port *pmic_typec_port, > + enum typec_cc_status cc); > + > +int qcom_pmic_typec_port_get_vbus(struct pmic_typec_port *pmic_typec_port); > + > +int qcom_pmic_typec_port_set_vconn(struct pmic_typec_port *pmic_typec_port, bool on); > + > +int qcom_pmic_typec_port_start_toggling(struct pmic_typec_port *pmic_typec_port, > + enum typec_port_type port_type, > + enum typec_cc_status cc); > + > +int qcom_pmic_typec_port_set_vbus(struct pmic_typec_port *pmic_typec_port, bool on); > + > +#endif /* __QCOM_PMIC_TYPE_C_PORT_H__ */ > -- > 2.39.2
On 24/04/2023 14:11, Heikki Krogerus wrote: > I think you need to rewrite the commit message - you still have that > third driver in there - but otherwise I don't have any more comments. > I hope Guenter has time to check this. In any case, FWIW: > > Acked-by: Heikki Krogerus<heikki.krogerus@linux.intel.com> appreciated --- bod
diff --git a/MAINTAINERS b/MAINTAINERS index 14a825f2bfb23..35d71858e768b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17530,6 +17530,16 @@ S: Maintained F: Documentation/devicetree/bindings/thermal/qcom-tsens.yaml F: drivers/thermal/qcom/ +QUALCOMM TYPEC PORT MANAGER DRIVER +M: Bryan O'Donoghue <bryan.odonoghue@linaro.org> +L: linux-arm-msm@vger.kernel.org +L: linux-usb@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/usb/qcom,pmic-*.yaml +F: drivers/usb/typec/tcpm/qcom/ +F: include/dt-bindings/usb/typec/qcom,pmic-pdphy.h +F: include/dt-bindings/usb/typec/qcom,pmic-typec.h + QUALCOMM VENUS VIDEO ACCELERATOR DRIVER M: Stanimir Varbanov <stanimir.k.varbanov@gmail.com> M: Vikash Garodia <quic_vgarodia@quicinc.com> diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig index 831e7049977df..2f80c2792dbda 100644 --- a/drivers/usb/typec/Kconfig +++ b/drivers/usb/typec/Kconfig @@ -100,19 +100,6 @@ config TYPEC_STUSB160X If you choose to build this driver as a dynamically linked module, the module will be called stusb160x.ko. -config TYPEC_QCOM_PMIC - tristate "Qualcomm PMIC USB Type-C driver" - depends on ARCH_QCOM || COMPILE_TEST - depends on USB_ROLE_SWITCH || !USB_ROLE_SWITCH - 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. - config TYPEC_WUSB3801 tristate "Willsemi WUSB3801 Type-C port controller driver" depends on I2C diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile index 4a83dad51a6cf..7a368fea61bc9 100644 --- a/drivers/usb/typec/Makefile +++ b/drivers/usb/typec/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_TYPEC_UCSI) += ucsi/ obj-$(CONFIG_TYPEC_TPS6598X) += tipd/ obj-$(CONFIG_TYPEC_ANX7411) += anx7411.o obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o -obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom-pmic-typec.o obj-$(CONFIG_TYPEC_STUSB160X) += stusb160x.o obj-$(CONFIG_TYPEC_RT1719) += rt1719.o obj-$(CONFIG_TYPEC_WUSB3801) += wusb3801.o diff --git a/drivers/usb/typec/qcom-pmic-typec.c b/drivers/usb/typec/qcom-pmic-typec.c deleted file mode 100644 index 432ea62f1bab6..0000000000000 --- a/drivers/usb/typec/qcom-pmic-typec.c +++ /dev/null @@ -1,261 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2020, The Linux Foundation. All rights reserved. - */ - -#include <linux/err.h> -#include <linux/interrupt.h> -#include <linux/kernel.h> -#include <linux/mod_devicetable.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/regmap.h> -#include <linux/regulator/consumer.h> -#include <linux/slab.h> -#include <linux/usb/role.h> -#include <linux/usb/typec_mux.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 regmap *regmap; - u32 base; - - 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; - - if (enable == qcom_usb->vbus_enabled) - 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) ? - 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, - enum typec_port_type type) -{ - 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 (type == TYPEC_PORT_SRC) - mode = EN_SRC_ONLY; - else if (type == TYPEC_PORT_SNK) - mode = EN_SNK_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 qcom_pmic_typec *qcom_usb; - struct device *dev = &pdev->dev; - struct fwnode_handle *fwnode; - struct typec_capability cap; - const char *buf; - int ret, irq, role; - u32 reg; - - ret = device_property_read_u32(dev, "reg", ®); - if (ret < 0) { - dev_err(dev, "missing base address\n"); - 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; - } - - qcom_usb->vbus_reg = devm_regulator_get(qcom_usb->dev, "usb_vbus"); - if (IS_ERR(qcom_usb->vbus_reg)) - return PTR_ERR(qcom_usb->vbus_reg); - - fwnode = device_get_named_child_node(dev, "connector"); - if (!fwnode) - return -EINVAL; - - ret = fwnode_property_read_string(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(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 = 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; - } - fwnode_handle_put(fwnode); - - qcom_usb->role_sw = fwnode_usb_role_switch_get(dev_fwnode(qcom_usb->dev)); - if (IS_ERR(qcom_usb->role_sw)) { - ret = dev_err_probe(dev, PTR_ERR(qcom_usb->role_sw), - "failed to get role switch\n"); - goto err_typec_port; - } - - irq = platform_get_irq(pdev, 0); - if (irq < 0) - goto err_usb_role_sw; - - 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"); - goto err_usb_role_sw; - } - - platform_set_drvdata(pdev, qcom_usb); - qcom_pmic_typec_typec_hw_init(qcom_usb, cap.type); - qcom_pmic_typec_check_connection(qcom_usb); - - return 0; - -err_usb_role_sw: - usb_role_switch_put(qcom_usb->role_sw); -err_typec_port: - typec_unregister_port(qcom_usb->port); -err_put_node: - fwnode_handle_put(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); - - 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"); diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig index e6b88ca4a4b94..5d393f520fc2f 100644 --- a/drivers/usb/typec/tcpm/Kconfig +++ b/drivers/usb/typec/tcpm/Kconfig @@ -76,4 +76,15 @@ config TYPEC_WCOVE To compile this driver as module, choose M here: the module will be called typec_wcove.ko +config TYPEC_QCOM_PMIC + tristate "Qualcomm PMIC USB Type-C Port Controller Manager driver" + depends on ARCH_QCOM || COMPILE_TEST + help + A Type-C port and Power Delivery driver which aggregates two + discrete pieces of silicon in the PM8150b PMIC block: the + Type-C port controller and the Power Delivery PHY. + + This driver enables Type-C role switching, orientation, Alternate + mode and Power Delivery support both for VBUS and VCONN. + endif # TYPEC_TCPM diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile index 08e57bb499cbc..7a8cad0c0bdb4 100644 --- a/drivers/usb/typec/tcpm/Makefile +++ b/drivers/usb/typec/tcpm/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.o obj-$(CONFIG_TYPEC_TCPCI_MT6370) += tcpci_mt6370.o obj-$(CONFIG_TYPEC_TCPCI_MAXIM) += tcpci_maxim.o tcpci_maxim-y += tcpci_maxim_core.o maxim_contaminant.o +obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom/ diff --git a/drivers/usb/typec/tcpm/qcom/Makefile b/drivers/usb/typec/tcpm/qcom/Makefile new file mode 100644 index 0000000000000..dc1e8832e197a --- /dev/null +++ b/drivers/usb/typec/tcpm/qcom/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +# +obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom_pmic_tcpm.o +qcom_pmic_tcpm-y += qcom_pmic_typec.o \ + qcom_pmic_typec_port.o \ + qcom_pmic_typec_pdphy.o diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c new file mode 100644 index 0000000000000..1e663988535f4 --- /dev/null +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c @@ -0,0 +1,362 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2023, Linaro Ltd. All rights reserved. + */ + +#include <linux/err.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/of_graph.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <linux/usb/role.h> +#include <linux/usb/tcpm.h> +#include <linux/usb/typec_mux.h> +#include "qcom_pmic_typec_pdphy.h" +#include "qcom_pmic_typec_port.h" + +struct pmic_typec_resources { + struct pmic_typec_pdphy_resources *pdphy_res; + struct pmic_typec_port_resources *port_res; +}; + +struct pmic_typec { + struct device *dev; + struct tcpm_port *tcpm_port; + struct tcpc_dev tcpc; + struct pmic_typec_pdphy *pmic_typec_pdphy; + struct pmic_typec_port *pmic_typec_port; + bool vbus_enabled; + struct mutex lock; /* VBUS state serialization */ +}; + +#define tcpc_to_tcpm(_tcpc_) container_of(_tcpc_, struct pmic_typec, tcpc) + +static int qcom_pmic_typec_get_vbus(struct tcpc_dev *tcpc) +{ + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); + int ret; + + mutex_lock(&tcpm->lock); + ret = tcpm->vbus_enabled || qcom_pmic_typec_port_get_vbus(tcpm->pmic_typec_port); + mutex_unlock(&tcpm->lock); + + return ret; +} + +static int qcom_pmic_typec_set_vbus(struct tcpc_dev *tcpc, bool on, bool sink) +{ + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); + int ret = 0; + + mutex_lock(&tcpm->lock); + if (tcpm->vbus_enabled == on) + goto done; + + ret = qcom_pmic_typec_port_set_vbus(tcpm->pmic_typec_port, on); + if (ret) + goto done; + + tcpm->vbus_enabled = on; + tcpm_vbus_change(tcpm->tcpm_port); + +done: + dev_dbg(tcpm->dev, "set_vbus set: %d result %d\n", on, ret); + mutex_unlock(&tcpm->lock); + + return ret; +} + +static int qcom_pmic_typec_set_vconn(struct tcpc_dev *tcpc, bool on) +{ + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); + + return qcom_pmic_typec_port_set_vconn(tcpm->pmic_typec_port, on); +} + +static int qcom_pmic_typec_get_cc(struct tcpc_dev *tcpc, + enum typec_cc_status *cc1, + enum typec_cc_status *cc2) +{ + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); + + return qcom_pmic_typec_port_get_cc(tcpm->pmic_typec_port, cc1, cc2); +} + +static int qcom_pmic_typec_set_cc(struct tcpc_dev *tcpc, + enum typec_cc_status cc) +{ + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); + + return qcom_pmic_typec_port_set_cc(tcpm->pmic_typec_port, cc); +} + +static int qcom_pmic_typec_set_polarity(struct tcpc_dev *tcpc, + enum typec_cc_polarity pol) +{ + /* Polarity is set separately by phy-qcom-qmp.c */ + return 0; +} + +static int qcom_pmic_typec_start_toggling(struct tcpc_dev *tcpc, + enum typec_port_type port_type, + enum typec_cc_status cc) +{ + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); + + return qcom_pmic_typec_port_start_toggling(tcpm->pmic_typec_port, + port_type, cc); +} + +static int qcom_pmic_typec_set_roles(struct tcpc_dev *tcpc, bool attached, + enum typec_role power_role, + enum typec_data_role data_role) +{ + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); + + return qcom_pmic_typec_pdphy_set_roles(tcpm->pmic_typec_pdphy, + data_role, power_role); +} + +static int qcom_pmic_typec_set_pd_rx(struct tcpc_dev *tcpc, bool on) +{ + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); + + return qcom_pmic_typec_pdphy_set_pd_rx(tcpm->pmic_typec_pdphy, on); +} + +static int qcom_pmic_typec_pd_transmit(struct tcpc_dev *tcpc, + enum tcpm_transmit_type type, + const struct pd_message *msg, + unsigned int negotiated_rev) +{ + struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc); + + return qcom_pmic_typec_pdphy_pd_transmit(tcpm->pmic_typec_pdphy, type, + msg, negotiated_rev); +} + +static int qcom_pmic_typec_init(struct tcpc_dev *tcpc) +{ + return 0; +} + +static int qcom_pmic_typec_probe(struct platform_device *pdev) +{ + struct pmic_typec *tcpm; + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + const struct pmic_typec_resources *res; + struct regmap *regmap; + u32 base[2]; + int ret; + + res = of_device_get_match_data(dev); + if (!res) + return -ENODEV; + + tcpm = devm_kzalloc(dev, sizeof(*tcpm), GFP_KERNEL); + if (!tcpm) + return -ENOMEM; + + tcpm->dev = dev; + tcpm->tcpc.init = qcom_pmic_typec_init; + tcpm->tcpc.get_vbus = qcom_pmic_typec_get_vbus; + tcpm->tcpc.set_vbus = qcom_pmic_typec_set_vbus; + tcpm->tcpc.set_cc = qcom_pmic_typec_set_cc; + tcpm->tcpc.get_cc = qcom_pmic_typec_get_cc; + tcpm->tcpc.set_polarity = qcom_pmic_typec_set_polarity; + tcpm->tcpc.set_vconn = qcom_pmic_typec_set_vconn; + tcpm->tcpc.start_toggling = qcom_pmic_typec_start_toggling; + tcpm->tcpc.set_pd_rx = qcom_pmic_typec_set_pd_rx; + tcpm->tcpc.set_roles = qcom_pmic_typec_set_roles; + tcpm->tcpc.pd_transmit = qcom_pmic_typec_pd_transmit; + + regmap = dev_get_regmap(dev->parent, NULL); + if (!regmap) { + dev_err(dev, "Failed to get regmap\n"); + return -ENODEV; + } + + ret = of_property_read_u32_array(np, "reg", base, 2); + if (ret) + return ret; + + tcpm->pmic_typec_port = qcom_pmic_typec_port_alloc(dev); + if (IS_ERR(tcpm->pmic_typec_port)) + return PTR_ERR(tcpm->pmic_typec_port); + + tcpm->pmic_typec_pdphy = qcom_pmic_typec_pdphy_alloc(dev); + if (IS_ERR(tcpm->pmic_typec_pdphy)) + return PTR_ERR(tcpm->pmic_typec_pdphy); + + ret = qcom_pmic_typec_port_probe(pdev, tcpm->pmic_typec_port, + res->port_res, regmap, base[0]); + if (ret) + return ret; + + ret = qcom_pmic_typec_pdphy_probe(pdev, tcpm->pmic_typec_pdphy, + res->pdphy_res, regmap, base[1]); + if (ret) + return ret; + + mutex_init(&tcpm->lock); + platform_set_drvdata(pdev, tcpm); + + tcpm->tcpc.fwnode = device_get_named_child_node(tcpm->dev, "connector"); + if (IS_ERR(tcpm->tcpc.fwnode)) + return PTR_ERR(tcpm->tcpc.fwnode); + + tcpm->tcpm_port = tcpm_register_port(tcpm->dev, &tcpm->tcpc); + if (IS_ERR(tcpm->tcpm_port)) { + ret = PTR_ERR(tcpm->tcpm_port); + goto fwnode_remove; + } + + ret = qcom_pmic_typec_port_start(tcpm->pmic_typec_port, + tcpm->tcpm_port); + if (ret) + goto fwnode_remove; + + ret = qcom_pmic_typec_pdphy_start(tcpm->pmic_typec_pdphy, + tcpm->tcpm_port); + if (ret) + goto fwnode_remove; + + return 0; + +fwnode_remove: + fwnode_remove_software_node(tcpm->tcpc.fwnode); + + return ret; +} + +static int qcom_pmic_typec_remove(struct platform_device *pdev) +{ + struct pmic_typec *tcpm = platform_get_drvdata(pdev); + + qcom_pmic_typec_pdphy_stop(tcpm->pmic_typec_pdphy); + qcom_pmic_typec_port_stop(tcpm->pmic_typec_port); + tcpm_unregister_port(tcpm->tcpm_port); + fwnode_remove_software_node(tcpm->tcpc.fwnode); + + return 0; +} + +static struct pmic_typec_pdphy_resources pm8150b_pdphy_res = { + .irq_params = { + { + .virq = PMIC_PDPHY_SIG_TX_IRQ, + .irq_name = "sig-tx", + }, + { + .virq = PMIC_PDPHY_SIG_RX_IRQ, + .irq_name = "sig-rx", + }, + { + .virq = PMIC_PDPHY_MSG_TX_IRQ, + .irq_name = "msg-tx", + }, + { + .virq = PMIC_PDPHY_MSG_RX_IRQ, + .irq_name = "msg-rx", + }, + { + .virq = PMIC_PDPHY_MSG_TX_FAIL_IRQ, + .irq_name = "msg-tx-failed", + }, + { + .virq = PMIC_PDPHY_MSG_TX_DISCARD_IRQ, + .irq_name = "msg-tx-discarded", + }, + { + .virq = PMIC_PDPHY_MSG_RX_DISCARD_IRQ, + .irq_name = "msg-rx-discarded", + }, + }, + .nr_irqs = 7, +}; + +static struct pmic_typec_port_resources pm8150b_port_res = { + .irq_params = { + { + .irq_name = "vpd-detect", + .virq = PMIC_TYPEC_VPD_IRQ, + }, + + { + .irq_name = "cc-state-change", + .virq = PMIC_TYPEC_CC_STATE_IRQ, + }, + { + .irq_name = "vconn-oc", + .virq = PMIC_TYPEC_VCONN_OC_IRQ, + }, + + { + .irq_name = "vbus-change", + .virq = PMIC_TYPEC_VBUS_IRQ, + }, + + { + .irq_name = "attach-detach", + .virq = PMIC_TYPEC_ATTACH_DETACH_IRQ, + }, + { + .irq_name = "legacy-cable-detect", + .virq = PMIC_TYPEC_LEGACY_CABLE_IRQ, + }, + + { + .irq_name = "try-snk-src-detect", + .virq = PMIC_TYPEC_TRY_SNK_SRC_IRQ, + }, + }, + .nr_irqs = 7, +}; + +struct pmic_typec_resources pm8150b_typec_res = { + .pdphy_res = &pm8150b_pdphy_res, + .port_res = &pm8150b_port_res, +}; + +static const struct of_device_id qcom_pmic_typec_table[] = { + { .compatible = "qcom,pm8150b-typec", .data = &pm8150b_typec_res }, + { } +}; +MODULE_DEVICE_TABLE(of, qcom_pmic_typec_table); + +static struct platform_driver qcom_pmic_typec_platform_driver = { + .driver = { + .name = "qcom,pmic-typec", + .of_match_table = qcom_pmic_typec_table, + }, + .probe = qcom_pmic_typec_probe, + .remove = qcom_pmic_typec_remove, +}; + +static int __init qcom_pmic_typec_module_init(void) +{ + int ret; + + ret = platform_driver_register(&qcom_pmic_typec_platform_driver); + if (ret) + return ret; + + return 0; +} +module_init(qcom_pmic_typec_module_init); + +static void __exit qcom_pmic_typec_module_exit(void) +{ + platform_driver_unregister(&qcom_pmic_typec_platform_driver); +} +module_exit(qcom_pmic_typec_module_exit); + +MODULE_DESCRIPTION("QCOM PMIC USB Type-C Port Manager Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c new file mode 100644 index 0000000000000..02f437b068bea --- /dev/null +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c @@ -0,0 +1,528 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2023, Linaro Ltd. All rights reserved. + */ + +#include <linux/err.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/of_irq.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <linux/usb/pd.h> +#include <linux/usb/tcpm.h> +#include "qcom_pmic_typec_pdphy.h" + +struct pmic_typec_pdphy_irq_data { + int virq; + int irq; + struct pmic_typec_pdphy *pmic_typec_pdphy; +}; + +struct pmic_typec_pdphy { + struct device *dev; + struct tcpm_port *tcpm_port; + struct regmap *regmap; + u32 base; + + unsigned int nr_irqs; + struct pmic_typec_pdphy_irq_data *irq_data; + + struct work_struct reset_work; + struct work_struct receive_work; + struct regulator *vdd_pdphy; + spinlock_t lock; /* Register atomicity */ +}; + +static void qcom_pmic_typec_pdphy_reset_on(struct pmic_typec_pdphy *pmic_typec_pdphy) +{ + struct device *dev = pmic_typec_pdphy->dev; + int ret; + + /* Terminate TX */ + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, 0); + if (ret) + goto err; + + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_FRAME_FILTER_REG, 0); + if (ret) + goto err; + + return; +err: + dev_err(dev, "pd_reset_on error\n"); +} + +static void qcom_pmic_typec_pdphy_reset_off(struct pmic_typec_pdphy *pmic_typec_pdphy) +{ + struct device *dev = pmic_typec_pdphy->dev; + int ret; + + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_FRAME_FILTER_REG, + FRAME_FILTER_EN_SOP | FRAME_FILTER_EN_HARD_RESET); + if (ret) + dev_err(dev, "pd_reset_off error\n"); +} + +static void qcom_pmic_typec_pdphy_sig_reset_work(struct work_struct *work) +{ + struct pmic_typec_pdphy *pmic_typec_pdphy = container_of(work, struct pmic_typec_pdphy, + reset_work); + unsigned long flags; + + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); + + qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy); + qcom_pmic_typec_pdphy_reset_off(pmic_typec_pdphy); + + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); + + tcpm_pd_hard_reset(pmic_typec_pdphy->tcpm_port); +} + +static int +qcom_pmic_typec_pdphy_clear_tx_control_reg(struct pmic_typec_pdphy *pmic_typec_pdphy) +{ + struct device *dev = pmic_typec_pdphy->dev; + unsigned int val; + int ret; + + /* Clear TX control register */ + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, 0); + if (ret) + goto done; + + /* Perform readback to ensure sufficient delay for command to latch */ + ret = regmap_read(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, &val); + +done: + if (ret) + dev_err(dev, "pd_clear_tx_control_reg: clear tx flag\n"); + + return ret; +} + +static int +qcom_pmic_typec_pdphy_pd_transmit_signal(struct pmic_typec_pdphy *pmic_typec_pdphy, + enum tcpm_transmit_type type, + unsigned int negotiated_rev) +{ + struct device *dev = pmic_typec_pdphy->dev; + unsigned int val; + unsigned long flags; + int ret; + + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); + + /* Clear TX control register */ + ret = qcom_pmic_typec_pdphy_clear_tx_control_reg(pmic_typec_pdphy); + if (ret) + goto done; + + val = TX_CONTROL_SEND_SIGNAL; + if (negotiated_rev == PD_REV30) + val |= TX_CONTROL_RETRY_COUNT(2); + else + val |= TX_CONTROL_RETRY_COUNT(3); + + if (type == TCPC_TX_CABLE_RESET || type == TCPC_TX_HARD_RESET) + val |= TX_CONTROL_FRAME_TYPE(1); + + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, val); + +done: + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); + + dev_vdbg(dev, "pd_transmit_signal: type %d negotiate_rev %d send %d\n", + type, negotiated_rev, ret); + + return ret; +} + +static int +qcom_pmic_typec_pdphy_pd_transmit_payload(struct pmic_typec_pdphy *pmic_typec_pdphy, + enum tcpm_transmit_type type, + const struct pd_message *msg, + unsigned int negotiated_rev) +{ + struct device *dev = pmic_typec_pdphy->dev; + unsigned int val, hdr_len, txbuf_len, txsize_len; + unsigned long flags; + int ret; + + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); + + ret = regmap_read(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG, + &val); + if (ret) + goto done; + + if (val) { + dev_err(dev, "pd_transmit_payload: RX message pending\n"); + ret = -EBUSY; + goto done; + } + + /* Clear TX control register */ + ret = qcom_pmic_typec_pdphy_clear_tx_control_reg(pmic_typec_pdphy); + if (ret) + goto done; + + hdr_len = sizeof(msg->header); + txbuf_len = pd_header_cnt_le(msg->header) * 4; + txsize_len = hdr_len + txbuf_len - 1; + + /* Write message header sizeof(u16) to USB_PDPHY_TX_BUFFER_HDR_REG */ + ret = regmap_bulk_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_TX_BUFFER_HDR_REG, + &msg->header, hdr_len); + if (ret) + goto done; + + /* Write payload to USB_PDPHY_TX_BUFFER_DATA_REG for txbuf_len */ + if (txbuf_len) { + ret = regmap_bulk_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_TX_BUFFER_DATA_REG, + &msg->payload, txbuf_len); + if (ret) + goto done; + } + + /* Write total length ((header + data) - 1) to USB_PDPHY_TX_SIZE_REG */ + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_TX_SIZE_REG, + txsize_len); + if (ret) + goto done; + + /* Clear TX control register */ + ret = qcom_pmic_typec_pdphy_clear_tx_control_reg(pmic_typec_pdphy); + if (ret) + goto done; + + /* Initiate transmit with retry count as indicated by PD revision */ + val = TX_CONTROL_FRAME_TYPE(type) | TX_CONTROL_SEND_MSG; + if (pd_header_rev(msg->header) == PD_REV30) + val |= TX_CONTROL_RETRY_COUNT(2); + else + val |= TX_CONTROL_RETRY_COUNT(3); + + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_TX_CONTROL_REG, val); + +done: + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); + + if (ret) { + dev_err(dev, "pd_transmit_payload: %d hdr %*ph data %*ph ret %d\n", + ret, hdr_len, &msg->header, txbuf_len, &msg->payload, ret); + } + + return ret; +} + +int qcom_pmic_typec_pdphy_pd_transmit(struct pmic_typec_pdphy *pmic_typec_pdphy, + enum tcpm_transmit_type type, + const struct pd_message *msg, + unsigned int negotiated_rev) +{ + struct device *dev = pmic_typec_pdphy->dev; + int ret; + + if (msg) { + ret = qcom_pmic_typec_pdphy_pd_transmit_payload(pmic_typec_pdphy, + type, msg, + negotiated_rev); + } else { + ret = qcom_pmic_typec_pdphy_pd_transmit_signal(pmic_typec_pdphy, + type, + negotiated_rev); + } + + if (ret) + dev_dbg(dev, "pd_transmit: type %x result %d\n", type, ret); + + return ret; +} + +static void qcom_pmic_typec_pdphy_pd_receive(struct pmic_typec_pdphy *pmic_typec_pdphy) +{ + struct device *dev = pmic_typec_pdphy->dev; + struct pd_message msg; + unsigned int size, rx_status; + unsigned long flags; + int ret; + + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); + + ret = regmap_read(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_RX_SIZE_REG, &size); + if (ret) + goto done; + + /* If we received a subsequent RX sig this value can be zero */ + if ((size < 1 || size > sizeof(msg.payload))) { + dev_dbg(dev, "pd_receive: invalid size %d\n", size); + goto done; + } + + size += 1; + ret = regmap_read(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_RX_STATUS_REG, + &rx_status); + + if (ret) + goto done; + + ret = regmap_bulk_read(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_RX_BUFFER_REG, + (u8 *)&msg, size); + if (ret) + goto done; + + /* Return ownership of RX buffer to hardware */ + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG, 0); + +done: + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); + + if (!ret) { + dev_vdbg(dev, "pd_receive: handing %d bytes to tcpm\n", size); + tcpm_pd_receive(pmic_typec_pdphy->tcpm_port, &msg); + } +} + +static irqreturn_t qcom_pmic_typec_pdphy_isr(int irq, void *dev_id) +{ + struct pmic_typec_pdphy_irq_data *irq_data = dev_id; + struct pmic_typec_pdphy *pmic_typec_pdphy = irq_data->pmic_typec_pdphy; + struct device *dev = pmic_typec_pdphy->dev; + + switch (irq_data->virq) { + case PMIC_PDPHY_SIG_TX_IRQ: + dev_err(dev, "isr: tx_sig\n"); + break; + case PMIC_PDPHY_SIG_RX_IRQ: + schedule_work(&pmic_typec_pdphy->reset_work); + break; + case PMIC_PDPHY_MSG_TX_IRQ: + tcpm_pd_transmit_complete(pmic_typec_pdphy->tcpm_port, + TCPC_TX_SUCCESS); + break; + case PMIC_PDPHY_MSG_RX_IRQ: + qcom_pmic_typec_pdphy_pd_receive(pmic_typec_pdphy); + break; + case PMIC_PDPHY_MSG_TX_FAIL_IRQ: + tcpm_pd_transmit_complete(pmic_typec_pdphy->tcpm_port, + TCPC_TX_FAILED); + break; + case PMIC_PDPHY_MSG_TX_DISCARD_IRQ: + tcpm_pd_transmit_complete(pmic_typec_pdphy->tcpm_port, + TCPC_TX_DISCARDED); + break; + } + + return IRQ_HANDLED; +} + +int qcom_pmic_typec_pdphy_set_pd_rx(struct pmic_typec_pdphy *pmic_typec_pdphy, bool on) +{ + unsigned long flags; + int ret; + + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); + + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG, !on); + + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); + + dev_dbg(pmic_typec_pdphy->dev, "set_pd_rx: %s\n", on ? "on" : "off"); + + return ret; +} + +int qcom_pmic_typec_pdphy_set_roles(struct pmic_typec_pdphy *pmic_typec_pdphy, + bool data_role_host, bool power_role_src) +{ + struct device *dev = pmic_typec_pdphy->dev; + unsigned long flags; + int ret; + + spin_lock_irqsave(&pmic_typec_pdphy->lock, flags); + + ret = regmap_update_bits(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_MSG_CONFIG_REG, + MSG_CONFIG_PORT_DATA_ROLE | + MSG_CONFIG_PORT_POWER_ROLE, + data_role_host << 3 | power_role_src << 2); + + spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags); + + dev_dbg(dev, "pdphy_set_roles: data_role_host=%d power_role_src=%d\n", + data_role_host, power_role_src); + + return ret; +} + +static int qcom_pmic_typec_pdphy_enable(struct pmic_typec_pdphy *pmic_typec_pdphy) +{ + struct device *dev = pmic_typec_pdphy->dev; + int ret; + + ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy); + if (ret) + return ret; + + /* PD 2.0, DR=TYPEC_DEVICE, PR=TYPEC_SINK */ + ret = regmap_update_bits(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_MSG_CONFIG_REG, + MSG_CONFIG_SPEC_REV_MASK, PD_REV20); + if (ret) + goto done; + + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0); + if (ret) + goto done; + + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, + CONTROL_ENABLE); + if (ret) + goto done; + + qcom_pmic_typec_pdphy_reset_off(pmic_typec_pdphy); +done: + if (ret) { + regulator_disable(pmic_typec_pdphy->vdd_pdphy); + dev_err(dev, "pdphy_enable fail %d\n", ret); + } + + return ret; +} + +static int qcom_pmic_typec_pdphy_disable(struct pmic_typec_pdphy *pmic_typec_pdphy) +{ + int ret; + + qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy); + + ret = regmap_write(pmic_typec_pdphy->regmap, + pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0); + + regulator_disable(pmic_typec_pdphy->vdd_pdphy); + + return ret; +} + +static int pmic_typec_pdphy_reset(struct pmic_typec_pdphy *pmic_typec_pdphy) +{ + int ret; + + ret = qcom_pmic_typec_pdphy_disable(pmic_typec_pdphy); + if (ret) + goto done; + + usleep_range(400, 500); + ret = qcom_pmic_typec_pdphy_enable(pmic_typec_pdphy); +done: + return ret; +} + +int qcom_pmic_typec_pdphy_start(struct pmic_typec_pdphy *pmic_typec_pdphy, + struct tcpm_port *tcpm_port) +{ + int i; + int ret; + + pmic_typec_pdphy->tcpm_port = tcpm_port; + + ret = pmic_typec_pdphy_reset(pmic_typec_pdphy); + if (ret) + return ret; + + for (i = 0; i < pmic_typec_pdphy->nr_irqs; i++) + enable_irq(pmic_typec_pdphy->irq_data[i].irq); + + return 0; +} + +void qcom_pmic_typec_pdphy_stop(struct pmic_typec_pdphy *pmic_typec_pdphy) +{ + int i; + + for (i = 0; i < pmic_typec_pdphy->nr_irqs; i++) + disable_irq(pmic_typec_pdphy->irq_data[i].irq); + + qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy); +} + +struct pmic_typec_pdphy *qcom_pmic_typec_pdphy_alloc(struct device *dev) +{ + return devm_kzalloc(dev, sizeof(struct pmic_typec_pdphy), GFP_KERNEL); +} + +int qcom_pmic_typec_pdphy_probe(struct platform_device *pdev, + struct pmic_typec_pdphy *pmic_typec_pdphy, + struct pmic_typec_pdphy_resources *res, + struct regmap *regmap, + u32 base) +{ + struct device *dev = &pdev->dev; + struct pmic_typec_pdphy_irq_data *irq_data; + int i, ret, irq; + + if (!res->nr_irqs || res->nr_irqs > PMIC_PDPHY_MAX_IRQS) + return -EINVAL; + + irq_data = devm_kzalloc(dev, sizeof(*irq_data) * res->nr_irqs, + GFP_KERNEL); + if (!irq_data) + return -ENOMEM; + + pmic_typec_pdphy->vdd_pdphy = devm_regulator_get(dev, "vdd-pdphy"); + if (IS_ERR(pmic_typec_pdphy->vdd_pdphy)) + return PTR_ERR(pmic_typec_pdphy->vdd_pdphy); + + pmic_typec_pdphy->dev = dev; + pmic_typec_pdphy->base = base; + pmic_typec_pdphy->regmap = regmap; + pmic_typec_pdphy->nr_irqs = res->nr_irqs; + pmic_typec_pdphy->irq_data = irq_data; + spin_lock_init(&pmic_typec_pdphy->lock); + INIT_WORK(&pmic_typec_pdphy->reset_work, qcom_pmic_typec_pdphy_sig_reset_work); + + for (i = 0; i < res->nr_irqs; i++, irq_data++) { + irq = platform_get_irq_byname(pdev, res->irq_params[i].irq_name); + if (irq < 0) + return irq; + + irq_data->pmic_typec_pdphy = pmic_typec_pdphy; + irq_data->irq = irq; + irq_data->virq = res->irq_params[i].virq; + + ret = devm_request_threaded_irq(dev, irq, NULL, + qcom_pmic_typec_pdphy_isr, + IRQF_ONESHOT | IRQF_NO_AUTOEN, + res->irq_params[i].irq_name, + irq_data); + if (ret) + return ret; + } + + return 0; +} diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h new file mode 100644 index 0000000000000..ebd33c9ae0606 --- /dev/null +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h @@ -0,0 +1,115 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2023, Linaro Ltd. All rights reserved. + */ +#ifndef __QCOM_PMIC_PDPHY_H__ +#define __QCOM_PMIC_PDPHY_H__ + +#define USB_PDPHY_MAX_DATA_OBJ_LEN 28 +#define USB_PDPHY_MSG_HDR_LEN 2 + +/* PD PHY register offsets and bit fields */ +#define USB_PDPHY_MSG_CONFIG_REG 0x40 +#define MSG_CONFIG_PORT_DATA_ROLE BIT(3) +#define MSG_CONFIG_PORT_POWER_ROLE BIT(2) +#define MSG_CONFIG_SPEC_REV_MASK (BIT(1) | BIT(0)) + +#define USB_PDPHY_EN_CONTROL_REG 0x46 +#define CONTROL_ENABLE BIT(0) + +#define USB_PDPHY_RX_STATUS_REG 0x4A +#define RX_FRAME_TYPE (BIT(0) | BIT(1) | BIT(2)) + +#define USB_PDPHY_FRAME_FILTER_REG 0x4C +#define FRAME_FILTER_EN_HARD_RESET BIT(5) +#define FRAME_FILTER_EN_SOP BIT(0) + +#define USB_PDPHY_TX_SIZE_REG 0x42 +#define TX_SIZE_MASK 0xF + +#define USB_PDPHY_TX_CONTROL_REG 0x44 +#define TX_CONTROL_RETRY_COUNT(n) (((n) & 0x3) << 5) +#define TX_CONTROL_FRAME_TYPE(n) (((n) & 0x7) << 2) +#define TX_CONTROL_FRAME_TYPE_CABLE_RESET (0x1 << 2) +#define TX_CONTROL_SEND_SIGNAL BIT(1) +#define TX_CONTROL_SEND_MSG BIT(0) + +#define USB_PDPHY_RX_SIZE_REG 0x48 + +#define USB_PDPHY_RX_ACKNOWLEDGE_REG 0x4B +#define RX_BUFFER_TOKEN BIT(0) + +#define USB_PDPHY_BIST_MODE_REG 0x4E +#define BIST_MODE_MASK 0xF +#define BIST_ENABLE BIT(7) +#define PD_MSG_BIST 0x3 +#define PD_BIST_TEST_DATA_MODE 0x8 + +#define USB_PDPHY_TX_BUFFER_HDR_REG 0x60 +#define USB_PDPHY_TX_BUFFER_DATA_REG 0x62 + +#define USB_PDPHY_RX_BUFFER_REG 0x80 + +/* VDD regulator */ +#define VDD_PDPHY_VOL_MIN 2800000 /* uV */ +#define VDD_PDPHY_VOL_MAX 3300000 /* uV */ +#define VDD_PDPHY_HPM_LOAD 3000 /* uA */ + +/* Message Spec Rev field */ +#define PD_MSG_HDR_REV(hdr) (((hdr) >> 6) & 3) + +/* timers */ +#define RECEIVER_RESPONSE_TIME 15 /* tReceiverResponse */ +#define HARD_RESET_COMPLETE_TIME 5 /* tHardResetComplete */ + +/* Interrupt numbers */ +#define PMIC_PDPHY_SIG_TX_IRQ 0x0 +#define PMIC_PDPHY_SIG_RX_IRQ 0x1 +#define PMIC_PDPHY_MSG_TX_IRQ 0x2 +#define PMIC_PDPHY_MSG_RX_IRQ 0x3 +#define PMIC_PDPHY_MSG_TX_FAIL_IRQ 0x4 +#define PMIC_PDPHY_MSG_TX_DISCARD_IRQ 0x5 +#define PMIC_PDPHY_MSG_RX_DISCARD_IRQ 0x6 +#define PMIC_PDPHY_FR_SWAP_IRQ 0x7 + +/* Resources */ +#define PMIC_PDPHY_MAX_IRQS 0x08 + +struct pmic_typec_pdphy_irq_params { + int virq; + char *irq_name; +}; + +struct pmic_typec_pdphy_resources { + unsigned int nr_irqs; + struct pmic_typec_pdphy_irq_params irq_params[PMIC_PDPHY_MAX_IRQS]; +}; + +/* API */ +struct pmic_typec_pdphy; + +struct pmic_typec_pdphy *qcom_pmic_typec_pdphy_alloc(struct device *dev); + +int qcom_pmic_typec_pdphy_probe(struct platform_device *pdev, + struct pmic_typec_pdphy *pmic_typec_pdphy, + struct pmic_typec_pdphy_resources *res, + struct regmap *regmap, + u32 base); + +int qcom_pmic_typec_pdphy_start(struct pmic_typec_pdphy *pmic_typec_pdphy, + struct tcpm_port *tcpm_port); + +void qcom_pmic_typec_pdphy_stop(struct pmic_typec_pdphy *pmic_typec_pdphy); + +int qcom_pmic_typec_pdphy_set_roles(struct pmic_typec_pdphy *pmic_typec_pdphy, + bool power_role_src, bool data_role_host); + +int qcom_pmic_typec_pdphy_set_pd_rx(struct pmic_typec_pdphy *pmic_typec_pdphy, bool on); + +int qcom_pmic_typec_pdphy_pd_transmit(struct pmic_typec_pdphy *pmic_typec_pdphy, + enum tcpm_transmit_type type, + const struct pd_message *msg, + unsigned int negotiated_rev); + +#endif /* __QCOM_PMIC_TYPEC_PDPHY_H__ */ diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c new file mode 100644 index 0000000000000..42c956b6a1a1d --- /dev/null +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c @@ -0,0 +1,560 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2023, Linaro Ltd. All rights reserved. + */ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <linux/usb/tcpm.h> +#include <linux/usb/typec_mux.h> +#include <linux/workqueue.h> +#include "qcom_pmic_typec_port.h" + +struct pmic_typec_port_irq_data { + int virq; + int irq; + struct pmic_typec_port *pmic_typec_port; +}; + +struct pmic_typec_port { + struct device *dev; + struct tcpm_port *tcpm_port; + struct regmap *regmap; + u32 base; + unsigned int nr_irqs; + struct pmic_typec_port_irq_data *irq_data; + + struct regulator *vdd_vbus; + + int cc; + bool debouncing_cc; + struct delayed_work cc_debounce_dwork; + + spinlock_t lock; /* Register atomicity */ +}; + +static const char * const typec_cc_status_name[] = { + [TYPEC_CC_OPEN] = "Open", + [TYPEC_CC_RA] = "Ra", + [TYPEC_CC_RD] = "Rd", + [TYPEC_CC_RP_DEF] = "Rp-def", + [TYPEC_CC_RP_1_5] = "Rp-1.5", + [TYPEC_CC_RP_3_0] = "Rp-3.0", +}; + +static const char *rp_unknown = "unknown"; + +static const char *cc_to_name(enum typec_cc_status cc) +{ + if (cc > TYPEC_CC_RP_3_0) + return rp_unknown; + + return typec_cc_status_name[cc]; +} + +static const char * const rp_sel_name[] = { + [TYPEC_SRC_RP_SEL_80UA] = "Rp-def-80uA", + [TYPEC_SRC_RP_SEL_180UA] = "Rp-1.5-180uA", + [TYPEC_SRC_RP_SEL_330UA] = "Rp-3.0-330uA", +}; + +static const char *rp_sel_to_name(int rp_sel) +{ + if (rp_sel > TYPEC_SRC_RP_SEL_330UA) + return rp_unknown; + + return rp_sel_name[rp_sel]; +} + +#define misc_to_cc(msic) !!(misc & CC_ORIENTATION) ? "cc1" : "cc2" +#define misc_to_vconn(msic) !!(misc & CC_ORIENTATION) ? "cc2" : "cc1" + +static void qcom_pmic_typec_port_cc_debounce(struct work_struct *work) +{ + struct pmic_typec_port *pmic_typec_port = + container_of(work, struct pmic_typec_port, cc_debounce_dwork.work); + unsigned long flags; + + spin_lock_irqsave(&pmic_typec_port->lock, flags); + pmic_typec_port->debouncing_cc = false; + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); + + dev_dbg(pmic_typec_port->dev, "Debounce cc complete\n"); +} + +static irqreturn_t pmic_typec_port_isr(int irq, void *dev_id) +{ + struct pmic_typec_port_irq_data *irq_data = dev_id; + struct pmic_typec_port *pmic_typec_port = irq_data->pmic_typec_port; + u32 misc_stat; + bool vbus_change = false; + bool cc_change = false; + unsigned long flags; + int ret; + + spin_lock_irqsave(&pmic_typec_port->lock, flags); + + ret = regmap_read(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, + &misc_stat); + if (ret) + goto done; + + switch (irq_data->virq) { + case PMIC_TYPEC_VBUS_IRQ: + /* Incoming vbus assert/de-assert detect */ + vbus_change = true; + break; + case PMIC_TYPEC_CC_STATE_IRQ: + if (!pmic_typec_port->debouncing_cc) + cc_change = true; + break; + case PMIC_TYPEC_ATTACH_DETACH_IRQ: + if (!pmic_typec_port->debouncing_cc) + cc_change = true; + break; + } + +done: + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); + + if (vbus_change) + tcpm_vbus_change(pmic_typec_port->tcpm_port); + + if (cc_change) + tcpm_cc_change(pmic_typec_port->tcpm_port); + + return IRQ_HANDLED; +} + +int qcom_pmic_typec_port_get_vbus(struct pmic_typec_port *pmic_typec_port) +{ + struct device *dev = pmic_typec_port->dev; + unsigned int misc; + int ret; + + ret = regmap_read(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, + &misc); + if (ret) + misc = 0; + + dev_dbg(dev, "get_vbus: 0x%08x detect %d\n", misc, !!(misc & TYPEC_VBUS_DETECT)); + + return !!(misc & TYPEC_VBUS_DETECT); +} + +int qcom_pmic_typec_port_set_vbus(struct pmic_typec_port *pmic_typec_port, bool on) +{ + u32 sm_stat; + u32 val; + int ret; + + if (on) { + ret = regulator_enable(pmic_typec_port->vdd_vbus); + if (ret) + return ret; + + val = TYPEC_SM_VBUS_VSAFE5V; + } else { + ret = regulator_disable(pmic_typec_port->vdd_vbus); + if (ret) + return ret; + + val = TYPEC_SM_VBUS_VSAFE0V; + } + + /* Poll waiting for transition to required vSafe5V or vSafe0V */ + ret = regmap_read_poll_timeout(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_SM_STATUS_REG, + sm_stat, sm_stat & val, + 100, 250000); + if (ret) + dev_warn(pmic_typec_port->dev, "vbus vsafe%dv fail\n", on ? 5 : 0); + + return 0; +} + +int qcom_pmic_typec_port_get_cc(struct pmic_typec_port *pmic_typec_port, + enum typec_cc_status *cc1, + enum typec_cc_status *cc2) +{ + struct device *dev = pmic_typec_port->dev; + unsigned int misc, val; + bool attached; + int ret = 0; + + ret = regmap_read(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, &misc); + if (ret) + goto done; + + attached = !!(misc & CC_ATTACHED); + + if (pmic_typec_port->debouncing_cc) { + ret = -EBUSY; + goto done; + } + + *cc1 = TYPEC_CC_OPEN; + *cc2 = TYPEC_CC_OPEN; + + if (!(attached)) + goto done; + + if (misc & SNK_SRC_MODE) { + ret = regmap_read(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_SRC_STATUS_REG, + &val); + if (ret) + goto done; + switch (val & DETECTED_SRC_TYPE_MASK) { + case SRC_RD_OPEN: + val = TYPEC_CC_RD; + break; + case SRC_RD_RA_VCONN: + val = TYPEC_CC_RD; + *cc1 = TYPEC_CC_RA; + *cc2 = TYPEC_CC_RA; + break; + default: + dev_warn(dev, "unexpected src status %.2x\n", val); + val = TYPEC_CC_RD; + break; + } + } else { + ret = regmap_read(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_SNK_STATUS_REG, + &val); + if (ret) + goto done; + switch (val & DETECTED_SNK_TYPE_MASK) { + case SNK_RP_STD: + val = TYPEC_CC_RP_DEF; + break; + case SNK_RP_1P5: + val = TYPEC_CC_RP_1_5; + break; + case SNK_RP_3P0: + val = TYPEC_CC_RP_3_0; + break; + default: + dev_warn(dev, "unexpected snk status %.2x\n", val); + val = TYPEC_CC_RP_DEF; + break; + } + val = TYPEC_CC_RP_DEF; + } + + if (misc & CC_ORIENTATION) + *cc2 = val; + else + *cc1 = val; + +done: + dev_dbg(dev, "get_cc: misc 0x%08x cc1 0x%08x %s cc2 0x%08x %s attached %d cc=%s\n", + misc, *cc1, cc_to_name(*cc1), *cc2, cc_to_name(*cc2), attached, + misc_to_cc(misc)); + + return ret; +} + +static void qcom_pmic_set_cc_debounce(struct pmic_typec_port *pmic_typec_port) +{ + pmic_typec_port->debouncing_cc = true; + schedule_delayed_work(&pmic_typec_port->cc_debounce_dwork, + msecs_to_jiffies(2)); +} + +int qcom_pmic_typec_port_set_cc(struct pmic_typec_port *pmic_typec_port, + enum typec_cc_status cc) +{ + struct device *dev = pmic_typec_port->dev; + unsigned int mode, currsrc; + unsigned int misc; + unsigned long flags; + int ret; + + spin_lock_irqsave(&pmic_typec_port->lock, flags); + + ret = regmap_read(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, + &misc); + if (ret) + goto done; + + mode = EN_SRC_ONLY; + + switch (cc) { + case TYPEC_CC_OPEN: + currsrc = TYPEC_SRC_RP_SEL_80UA; + break; + case TYPEC_CC_RP_DEF: + currsrc = TYPEC_SRC_RP_SEL_80UA; + break; + case TYPEC_CC_RP_1_5: + currsrc = TYPEC_SRC_RP_SEL_180UA; + break; + case TYPEC_CC_RP_3_0: + currsrc = TYPEC_SRC_RP_SEL_330UA; + break; + case TYPEC_CC_RD: + currsrc = TYPEC_SRC_RP_SEL_80UA; + mode = EN_SNK_ONLY; + break; + default: + dev_warn(dev, "unexpected set_cc %d\n", cc); + ret = -EINVAL; + goto done; + } + + if (mode == EN_SRC_ONLY) { + ret = regmap_write(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_CURRSRC_CFG_REG, + currsrc); + if (ret) + goto done; + } + + pmic_typec_port->cc = cc; + qcom_pmic_set_cc_debounce(pmic_typec_port); + ret = 0; + +done: + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); + + dev_dbg(dev, "set_cc: currsrc=%x %s mode %s debounce %d attached %d cc=%s\n", + currsrc, rp_sel_to_name(currsrc), + mode == EN_SRC_ONLY ? "EN_SRC_ONLY" : "EN_SNK_ONLY", + pmic_typec_port->debouncing_cc, !!(misc & CC_ATTACHED), + misc_to_cc(misc)); + + return ret; +} + +int qcom_pmic_typec_port_set_vconn(struct pmic_typec_port *pmic_typec_port, bool on) +{ + struct device *dev = pmic_typec_port->dev; + unsigned int orientation, misc, mask, value; + unsigned long flags; + int ret; + + spin_lock_irqsave(&pmic_typec_port->lock, flags); + + ret = regmap_read(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, &misc); + if (ret) + goto done; + + /* Set VCONN on the inversion of the active CC channel */ + orientation = (misc & CC_ORIENTATION) ? 0 : VCONN_EN_ORIENTATION; + if (on) { + mask = VCONN_EN_ORIENTATION | VCONN_EN_VALUE; + value = orientation | VCONN_EN_VALUE | VCONN_EN_SRC; + } else { + mask = VCONN_EN_VALUE; + value = 0; + } + + ret = regmap_update_bits(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_VCONN_CONTROL_REG, + mask, value); +done: + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); + + dev_dbg(dev, "set_vconn: orientation %d control 0x%08x state %s cc %s vconn %s\n", + orientation, value, on ? "on" : "off", misc_to_vconn(misc), misc_to_cc(misc)); + + return ret; +} + +int qcom_pmic_typec_port_start_toggling(struct pmic_typec_port *pmic_typec_port, + enum typec_port_type port_type, + enum typec_cc_status cc) +{ + struct device *dev = pmic_typec_port->dev; + unsigned int misc; + u8 mode = 0; + unsigned long flags; + int ret; + + switch (port_type) { + case TYPEC_PORT_SRC: + mode = EN_SRC_ONLY; + break; + case TYPEC_PORT_SNK: + mode = EN_SNK_ONLY; + break; + case TYPEC_PORT_DRP: + mode = EN_TRY_SNK; + break; + } + + spin_lock_irqsave(&pmic_typec_port->lock, flags); + + ret = regmap_read(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_MISC_STATUS_REG, &misc); + if (ret) + goto done; + + dev_dbg(dev, "start_toggling: misc 0x%08x attached %d port_type %d current cc %d new %d\n", + misc, !!(misc & CC_ATTACHED), port_type, pmic_typec_port->cc, cc); + + qcom_pmic_set_cc_debounce(pmic_typec_port); + + /* force it to toggle at least once */ + ret = regmap_write(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_MODE_CFG_REG, + TYPEC_DISABLE_CMD); + if (ret) + goto done; + + ret = regmap_write(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_MODE_CFG_REG, + mode); +done: + spin_unlock_irqrestore(&pmic_typec_port->lock, flags); + + return ret; +} + +#define TYPEC_INTR_EN_CFG_1_MASK \ + (TYPEC_LEGACY_CABLE_INT_EN | \ + TYPEC_NONCOMPLIANT_LEGACY_CABLE_INT_EN | \ + TYPEC_TRYSOURCE_DETECT_INT_EN | \ + TYPEC_TRYSINK_DETECT_INT_EN | \ + TYPEC_CCOUT_DETACH_INT_EN | \ + TYPEC_CCOUT_ATTACH_INT_EN | \ + TYPEC_VBUS_DEASSERT_INT_EN | \ + TYPEC_VBUS_ASSERT_INT_EN) + +#define TYPEC_INTR_EN_CFG_2_MASK \ + (TYPEC_STATE_MACHINE_CHANGE_INT_EN | TYPEC_VBUS_ERROR_INT_EN | \ + TYPEC_DEBOUNCE_DONE_INT_EN) + +int qcom_pmic_typec_port_start(struct pmic_typec_port *pmic_typec_port, + struct tcpm_port *tcpm_port) +{ + int i; + int mask; + int ret; + + /* Configure interrupt sources */ + ret = regmap_write(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_INTERRUPT_EN_CFG_1_REG, + TYPEC_INTR_EN_CFG_1_MASK); + if (ret) + goto done; + + ret = regmap_write(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_INTERRUPT_EN_CFG_2_REG, + TYPEC_INTR_EN_CFG_2_MASK); + if (ret) + goto done; + + /* start in TRY_SNK mode */ + ret = regmap_write(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_MODE_CFG_REG, EN_TRY_SNK); + if (ret) + goto done; + + /* Configure VCONN for software control */ + ret = regmap_update_bits(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_VCONN_CONTROL_REG, + VCONN_EN_SRC | VCONN_EN_VALUE, VCONN_EN_SRC); + if (ret) + goto done; + + /* Set CC threshold to 1.6 Volts | tPDdebounce = 10-20ms */ + mask = SEL_SRC_UPPER_REF | USE_TPD_FOR_EXITING_ATTACHSRC; + ret = regmap_update_bits(pmic_typec_port->regmap, + pmic_typec_port->base + TYPEC_EXIT_STATE_CFG_REG, + mask, mask); + if (ret) + goto done; + + pmic_typec_port->tcpm_port = tcpm_port; + + for (i = 0; i < pmic_typec_port->nr_irqs; i++) + enable_irq(pmic_typec_port->irq_data[i].irq); + +done: + return ret; +} + +void qcom_pmic_typec_port_stop(struct pmic_typec_port *pmic_typec_port) +{ + int i; + + for (i = 0; i < pmic_typec_port->nr_irqs; i++) + disable_irq(pmic_typec_port->irq_data[i].irq); +} + +struct pmic_typec_port *qcom_pmic_typec_port_alloc(struct device *dev) +{ + return devm_kzalloc(dev, sizeof(struct pmic_typec_port), GFP_KERNEL); +} + +int qcom_pmic_typec_port_probe(struct platform_device *pdev, + struct pmic_typec_port *pmic_typec_port, + struct pmic_typec_port_resources *res, + struct regmap *regmap, + u32 base) +{ + struct device *dev = &pdev->dev; + struct pmic_typec_port_irq_data *irq_data; + int i, ret, irq; + + if (!res->nr_irqs || res->nr_irqs > PMIC_TYPEC_MAX_IRQS) + return -EINVAL; + + irq_data = devm_kzalloc(dev, sizeof(*irq_data) * res->nr_irqs, + GFP_KERNEL); + if (!irq_data) + return -ENOMEM; + + pmic_typec_port->vdd_vbus = devm_regulator_get(dev, "vdd-vbus"); + if (IS_ERR(pmic_typec_port->vdd_vbus)) + return PTR_ERR(pmic_typec_port->vdd_vbus); + + pmic_typec_port->dev = dev; + pmic_typec_port->base = base; + pmic_typec_port->regmap = regmap; + pmic_typec_port->nr_irqs = res->nr_irqs; + pmic_typec_port->irq_data = irq_data; + spin_lock_init(&pmic_typec_port->lock); + INIT_DELAYED_WORK(&pmic_typec_port->cc_debounce_dwork, + qcom_pmic_typec_port_cc_debounce); + + irq = platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + + for (i = 0; i < res->nr_irqs; i++, irq_data++) { + irq = platform_get_irq_byname(pdev, + res->irq_params[i].irq_name); + if (irq < 0) + return irq; + + irq_data->pmic_typec_port = pmic_typec_port; + irq_data->irq = irq; + irq_data->virq = res->irq_params[i].virq; + ret = devm_request_threaded_irq(dev, irq, NULL, pmic_typec_port_isr, + IRQF_ONESHOT | IRQF_NO_AUTOEN, + res->irq_params[i].irq_name, + irq_data); + if (ret) + return ret; + } + + return 0; +} diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h new file mode 100644 index 0000000000000..5a9c47373c614 --- /dev/null +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h @@ -0,0 +1,194 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2023, Linaro Ltd. All rights reserved. + */ +#ifndef __QCOM_PMIC_TYPEC_H__ +#define __QCOM_PMIC_TYPEC_H__ + +#include <linux/usb/tcpm.h> + +#define TYPEC_SNK_STATUS_REG 0x06 +#define DETECTED_SNK_TYPE_MASK GENMASK(6, 0) +#define SNK_DAM_MASK GENMASK(6, 4) +#define SNK_DAM_500MA BIT(6) +#define SNK_DAM_1500MA BIT(5) +#define SNK_DAM_3000MA BIT(4) +#define SNK_RP_STD BIT(3) +#define SNK_RP_1P5 BIT(2) +#define SNK_RP_3P0 BIT(1) +#define SNK_RP_SHORT BIT(0) + +#define TYPEC_SRC_STATUS_REG 0x08 +#define DETECTED_SRC_TYPE_MASK GENMASK(4, 0) +#define SRC_HIGH_BATT BIT(5) +#define SRC_DEBUG_ACCESS BIT(4) +#define SRC_RD_OPEN BIT(3) +#define SRC_RD_RA_VCONN BIT(2) +#define SRC_RA_OPEN BIT(1) +#define AUDIO_ACCESS_RA_RA BIT(0) + +#define TYPEC_STATE_MACHINE_STATUS_REG 0x09 +#define TYPEC_ATTACH_DETACH_STATE BIT(5) + +#define TYPEC_SM_STATUS_REG 0x0A +#define TYPEC_SM_VBUS_VSAFE5V BIT(5) +#define TYPEC_SM_VBUS_VSAFE0V BIT(6) +#define TYPEC_SM_USBIN_LT_LV BIT(7) + +#define TYPEC_MISC_STATUS_REG 0x0B +#define TYPEC_WATER_DETECTION_STATUS BIT(7) +#define SNK_SRC_MODE BIT(6) +#define TYPEC_VBUS_DETECT BIT(5) +#define TYPEC_VBUS_ERROR_STATUS BIT(4) +#define TYPEC_DEBOUNCE_DONE BIT(3) +#define CC_ORIENTATION BIT(1) +#define CC_ATTACHED BIT(0) + +#define LEGACY_CABLE_STATUS_REG 0x0D +#define TYPEC_LEGACY_CABLE_STATUS BIT(1) +#define TYPEC_NONCOMP_LEGACY_CABLE_STATUS BIT(0) + +#define TYPEC_U_USB_STATUS_REG 0x0F +#define U_USB_GROUND_NOVBUS BIT(6) +#define U_USB_GROUND BIT(4) +#define U_USB_FMB1 BIT(3) +#define U_USB_FLOAT1 BIT(2) +#define U_USB_FMB2 BIT(1) +#define U_USB_FLOAT2 BIT(0) + +#define TYPEC_MODE_CFG_REG 0x44 +#define TYPEC_TRY_MODE_MASK GENMASK(4, 3) +#define EN_TRY_SNK BIT(4) +#define EN_TRY_SRC BIT(3) +#define TYPEC_POWER_ROLE_CMD_MASK GENMASK(2, 0) +#define EN_SRC_ONLY BIT(2) +#define EN_SNK_ONLY BIT(1) +#define TYPEC_DISABLE_CMD BIT(0) + +#define TYPEC_VCONN_CONTROL_REG 0x46 +#define VCONN_EN_ORIENTATION BIT(2) +#define VCONN_EN_VALUE BIT(1) +#define VCONN_EN_SRC BIT(0) + +#define TYPEC_CCOUT_CONTROL_REG 0x48 +#define TYPEC_CCOUT_BUFFER_EN BIT(2) +#define TYPEC_CCOUT_VALUE BIT(1) +#define TYPEC_CCOUT_SRC BIT(0) + +#define DEBUG_ACCESS_SRC_CFG_REG 0x4C +#define EN_UNORIENTED_DEBUG_ACCESS_SRC BIT(0) + +#define TYPE_C_CRUDE_SENSOR_CFG_REG 0x4e +#define EN_SRC_CRUDE_SENSOR BIT(1) +#define EN_SNK_CRUDE_SENSOR BIT(0) + +#define TYPEC_EXIT_STATE_CFG_REG 0x50 +#define BYPASS_VSAFE0V_DURING_ROLE_SWAP BIT(3) +#define SEL_SRC_UPPER_REF BIT(2) +#define USE_TPD_FOR_EXITING_ATTACHSRC BIT(1) +#define EXIT_SNK_BASED_ON_CC BIT(0) + +#define TYPEC_CURRSRC_CFG_REG 0x52 +#define TYPEC_SRC_RP_SEL_330UA BIT(1) +#define TYPEC_SRC_RP_SEL_180UA BIT(0) +#define TYPEC_SRC_RP_SEL_80UA 0 +#define TYPEC_SRC_RP_SEL_MASK GENMASK(1, 0) + +#define TYPEC_INTERRUPT_EN_CFG_1_REG 0x5E +#define TYPEC_LEGACY_CABLE_INT_EN BIT(7) +#define TYPEC_NONCOMPLIANT_LEGACY_CABLE_INT_EN BIT(6) +#define TYPEC_TRYSOURCE_DETECT_INT_EN BIT(5) +#define TYPEC_TRYSINK_DETECT_INT_EN BIT(4) +#define TYPEC_CCOUT_DETACH_INT_EN BIT(3) +#define TYPEC_CCOUT_ATTACH_INT_EN BIT(2) +#define TYPEC_VBUS_DEASSERT_INT_EN BIT(1) +#define TYPEC_VBUS_ASSERT_INT_EN BIT(0) + +#define TYPEC_INTERRUPT_EN_CFG_2_REG 0x60 +#define TYPEC_SRC_BATT_HPWR_INT_EN BIT(6) +#define MICRO_USB_STATE_CHANGE_INT_EN BIT(5) +#define TYPEC_STATE_MACHINE_CHANGE_INT_EN BIT(4) +#define TYPEC_DEBUG_ACCESS_DETECT_INT_EN BIT(3) +#define TYPEC_WATER_DETECTION_INT_EN BIT(2) +#define TYPEC_VBUS_ERROR_INT_EN BIT(1) +#define TYPEC_DEBOUNCE_DONE_INT_EN BIT(0) + +#define TYPEC_DEBOUNCE_OPTION_REG 0x62 +#define REDUCE_TCCDEBOUNCE_TO_2MS BIT(2) + +#define TYPE_C_SBU_CFG_REG 0x6A +#define SEL_SBU1_ISRC_VAL 0x04 +#define SEL_SBU2_ISRC_VAL 0x01 + +#define TYPEC_U_USB_CFG_REG 0x70 +#define EN_MICRO_USB_FACTORY_MODE BIT(1) +#define EN_MICRO_USB_MODE BIT(0) + +#define TYPEC_PMI632_U_USB_WATER_PROTECTION_CFG_REG 0x72 + +#define TYPEC_U_USB_WATER_PROTECTION_CFG_REG 0x73 +#define EN_MICRO_USB_WATER_PROTECTION BIT(4) +#define MICRO_USB_DETECTION_ON_TIME_CFG_MASK GENMASK(3, 2) +#define MICRO_USB_DETECTION_PERIOD_CFG_MASK GENMASK(1, 0) + +#define TYPEC_PMI632_MICRO_USB_MODE_REG 0x73 +#define MICRO_USB_MODE_ONLY BIT(0) + +/* Interrupt numbers */ +#define PMIC_TYPEC_OR_RID_IRQ 0x0 +#define PMIC_TYPEC_VPD_IRQ 0x1 +#define PMIC_TYPEC_CC_STATE_IRQ 0x2 +#define PMIC_TYPEC_VCONN_OC_IRQ 0x3 +#define PMIC_TYPEC_VBUS_IRQ 0x4 +#define PMIC_TYPEC_ATTACH_DETACH_IRQ 0x5 +#define PMIC_TYPEC_LEGACY_CABLE_IRQ 0x6 +#define PMIC_TYPEC_TRY_SNK_SRC_IRQ 0x7 + +/* Resources */ +#define PMIC_TYPEC_MAX_IRQS 0x08 + +struct pmic_typec_port_irq_params { + int virq; + char *irq_name; +}; + +struct pmic_typec_port_resources { + unsigned int nr_irqs; + struct pmic_typec_port_irq_params irq_params[PMIC_TYPEC_MAX_IRQS]; +}; + +/* API */ +struct pmic_typec; + +struct pmic_typec_port *qcom_pmic_typec_port_alloc(struct device *dev); + +int qcom_pmic_typec_port_probe(struct platform_device *pdev, + struct pmic_typec_port *pmic_typec_port, + struct pmic_typec_port_resources *res, + struct regmap *regmap, + u32 base); + +int qcom_pmic_typec_port_start(struct pmic_typec_port *pmic_typec_port, + struct tcpm_port *tcpm_port); + +void qcom_pmic_typec_port_stop(struct pmic_typec_port *pmic_typec_port); + +int qcom_pmic_typec_port_get_cc(struct pmic_typec_port *pmic_typec_port, + enum typec_cc_status *cc1, + enum typec_cc_status *cc2); + +int qcom_pmic_typec_port_set_cc(struct pmic_typec_port *pmic_typec_port, + enum typec_cc_status cc); + +int qcom_pmic_typec_port_get_vbus(struct pmic_typec_port *pmic_typec_port); + +int qcom_pmic_typec_port_set_vconn(struct pmic_typec_port *pmic_typec_port, bool on); + +int qcom_pmic_typec_port_start_toggling(struct pmic_typec_port *pmic_typec_port, + enum typec_port_type port_type, + enum typec_cc_status cc); + +int qcom_pmic_typec_port_set_vbus(struct pmic_typec_port *pmic_typec_port, bool on); + +#endif /* __QCOM_PMIC_TYPE_C_PORT_H__ */
This commit adds a QCOM PMIC TCPM driver with an initial pm8150b block. qcom_pmic_virt_tcpm.c : Responsible for registering with TCPM and arbitrates access to the Type-C and PDPHY hardware blocks in one place. This driver presents a virtual device to the Linux TCPM layer. qcom_pmic_pdphy.c: Rsponsible for interfacing with the PDPHY hardware and processing power-delivery related calls from TCPM. This hardware binding can be extended to facilitate similar hardware in different PMICs. qcom_pmic_typec.c: Responsible for notifying and processing Type-C related calls from TCPM. This hardware binding can be extended to facilitate similar hardware in different PMICs. This code provides all of the same functionality as the existing qcom typec driver plus power-delivery as well. As a result commit 6c8cf3695176 ("usb: typec: Add QCOM PMIC typec detection driver") can be deleted entirely. References code from Jonathan Marek, Jack Pham, Wesley Cheng, Hemant Kumar, Guru Das Srinagesh and Ashay Jaiswal. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- MAINTAINERS | 10 + drivers/usb/typec/Kconfig | 13 - drivers/usb/typec/Makefile | 1 - drivers/usb/typec/qcom-pmic-typec.c | 261 -------- drivers/usb/typec/tcpm/Kconfig | 11 + drivers/usb/typec/tcpm/Makefile | 1 + drivers/usb/typec/tcpm/qcom/Makefile | 6 + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 362 +++++++++++ .../typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 528 +++++++++++++++++ .../typec/tcpm/qcom/qcom_pmic_typec_pdphy.h | 115 ++++ .../typec/tcpm/qcom/qcom_pmic_typec_port.c | 560 ++++++++++++++++++ .../typec/tcpm/qcom/qcom_pmic_typec_port.h | 194 ++++++ 12 files changed, 1787 insertions(+), 275 deletions(-) delete mode 100644 drivers/usb/typec/qcom-pmic-typec.c create mode 100644 drivers/usb/typec/tcpm/qcom/Makefile create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h