usb: typec: qcom-pmic-typec: add support for PMI632 PMIC

The PMI632 PMIC support Type-C port handling, but lacks USB
PowerDelivery support. The TCPM requires all callbacks to be provided
by the implementation. Implement a special, 'stub' Qcom PD PHY
implementation to enable the PMI632 support.

Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: Luca Weiss <luca.weiss@fairphone.com> # sdm632-fairphone-fp3
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240130-pmi632-typec-v3-3-b05fe44f0a51@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/tcpm/qcom/Makefile b/drivers/usb/typec/tcpm/qcom/Makefile
index dc1e8832e197a68b4592163ecd4cc1877bb43d1c..cc23042b9487850ea39c88151a1f36898a8e9c3c 100644 (file)
--- a/drivers/usb/typec/tcpm/qcom/Makefile
+++ b/drivers/usb/typec/tcpm/qcom/Makefile
@@ -3,4 +3,5 @@
 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
+                                          qcom_pmic_typec_pdphy.o \
+                                          qcom_pmic_typec_pdphy_stub.o \

diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
index 82e3f59ea471b42b99540d3a527129b247d1b7b9..e48412cdcb0fb5b5562afb2ce65af38a1d31840c 100644 (file)
--- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
@@ -42,7 +42,7 @@ static int qcom_pmic_typec_probe(struct platform_device *pdev)
        const struct pmic_typec_resources *res;
        struct regmap *regmap;
        struct device *bridge_dev;
-       u32 base[2];
+       u32 base;
        int ret;
 
        res = of_device_get_match_data(dev);
@@ -62,19 +62,29 @@ static int qcom_pmic_typec_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       ret = of_property_read_u32_array(np, "reg", base, 2);
+       ret = of_property_read_u32_index(np, "reg", 0, &base);
        if (ret)
                return ret;
 
        ret = qcom_pmic_typec_port_probe(pdev, tcpm,
-                                        res->port_res, regmap, base[0]);
+                                        res->port_res, regmap, base);
        if (ret)
                return ret;
 
-       ret = qcom_pmic_typec_pdphy_probe(pdev, tcpm,
-                                         res->pdphy_res, regmap, base[1]);
-       if (ret)
-               return ret;
+       if (res->pdphy_res) {
+               ret = of_property_read_u32_index(np, "reg", 1, &base);
+               if (ret)
+                       return ret;
+
+               ret = qcom_pmic_typec_pdphy_probe(pdev, tcpm,
+                                                 res->pdphy_res, regmap, base);
+               if (ret)
+                       return ret;
+       } else {
+               ret = qcom_pmic_typec_pdphy_stub_probe(pdev, tcpm);
+               if (ret)
+                       return ret;
+       }
 
        platform_set_drvdata(pdev, tcpm);
 
@@ -123,8 +133,14 @@ static const struct pmic_typec_resources pm8150b_typec_res = {
        .port_res = &pm8150b_port_res,
 };
 
+static const struct pmic_typec_resources pmi632_typec_res = {
+       /* PD PHY not present */
+       .port_res = &pm8150b_port_res,
+};
+
 static const struct of_device_id qcom_pmic_typec_table[] = {
        { .compatible = "qcom,pm8150b-typec", .data = &pm8150b_typec_res },
+       { .compatible = "qcom,pmi632-typec", .data = &pmi632_typec_res },
        { }
 };
 MODULE_DEVICE_TABLE(of, qcom_pmic_typec_table);

diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h
index 5f428e67ccfe2b5f0a0de1515f542faaa32a1cb3..04dee20293cfad55d92cb2cefc3bfbef589ea308 100644 (file)
--- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h
@@ -31,5 +31,7 @@ int qcom_pmic_typec_pdphy_probe(struct platform_device *pdev,
                                const struct pmic_typec_pdphy_resources *res,
                                struct regmap *regmap,
                                u32 base);
+int qcom_pmic_typec_pdphy_stub_probe(struct platform_device *pdev,
+                                    struct pmic_typec *tcpm);
 
 #endif /* __QCOM_PMIC_TYPEC_PDPHY_H__ */

diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c
new file mode 100644 (file)
index 0000000..df79059
--- /dev/null
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2024, 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/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.h"
+#include "qcom_pmic_typec_pdphy.h"
+
+static int qcom_pmic_typec_pdphy_stub_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);
+       struct device *dev = tcpm->dev;
+
+       dev_dbg(dev, "pdphy_transmit: type=%d\n", type);
+
+       tcpm_pd_transmit_complete(tcpm->tcpm_port,
+                                 TCPC_TX_SUCCESS);
+
+       return 0;
+}
+
+static int qcom_pmic_typec_pdphy_stub_set_pd_rx(struct tcpc_dev *tcpc, bool on)
+{
+       struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc);
+       struct device *dev = tcpm->dev;
+
+       dev_dbg(dev, "set_pd_rx: %s\n", on ? "on" : "off");
+
+       return 0;
+}
+
+static int qcom_pmic_typec_pdphy_stub_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);
+       struct device *dev = tcpm->dev;
+
+       dev_dbg(dev, "pdphy_set_roles: data_role_host=%d power_role_src=%d\n",
+               data_role, power_role);
+
+       return 0;
+}
+
+static int qcom_pmic_typec_pdphy_stub_start(struct pmic_typec *tcpm,
+                                           struct tcpm_port *tcpm_port)
+{
+       return 0;
+}
+
+static void qcom_pmic_typec_pdphy_stub_stop(struct pmic_typec *tcpm)
+{
+}
+
+int qcom_pmic_typec_pdphy_stub_probe(struct platform_device *pdev,
+                                    struct pmic_typec *tcpm)
+{
+       tcpm->tcpc.set_pd_rx = qcom_pmic_typec_pdphy_stub_set_pd_rx;
+       tcpm->tcpc.set_roles = qcom_pmic_typec_pdphy_stub_set_roles;
+       tcpm->tcpc.pd_transmit = qcom_pmic_typec_pdphy_stub_pd_transmit;
+
+       tcpm->pdphy_start = qcom_pmic_typec_pdphy_stub_start;
+       tcpm->pdphy_stop = qcom_pmic_typec_pdphy_stub_stop;
+
+       return 0;
+}