phy: qcom-qmp-usb: restructure PHY creation

In preparation for supporting devicetree bindings which do not use a
child node, move the PHY creation to probe() proper and parse the serdes
and dp_com resources in what is now the legacy devicetree helper.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20221028160435.26948-13-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index cf1e04e9daf7a28094eec38bdb60378a1ac19b07..fa87e90a821eb574efa822b855828e50e6e5dd3d 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@ -2386,13 +2386,22 @@ static void __iomem *qmp_usb_iomap(struct device *dev, struct device_node *np,
        return devm_of_iomap(dev, np, index, NULL);
 }
 
-static int qmp_usb_create(struct qmp_usb *qmp, struct device_node *np)
+static int qmp_usb_parse_dt_legacy(struct qmp_usb *qmp, struct device_node *np)
 {
+       struct platform_device *pdev = to_platform_device(qmp->dev);
        const struct qmp_phy_cfg *cfg = qmp->cfg;
        struct device *dev = qmp->dev;
-       struct phy *generic_phy;
        bool exclusive = true;
-       int ret;
+
+       qmp->serdes = devm_platform_ioremap_resource(pdev, 0);
+       if (IS_ERR(qmp->serdes))
+               return PTR_ERR(qmp->serdes);
+
+       if (cfg->has_phy_dp_com_ctrl) {
+               qmp->dp_com = devm_platform_ioremap_resource(pdev, 1);
+               if (IS_ERR(qmp->dp_com))
+                       return PTR_ERR(qmp->dp_com);
+       }
 
        /*
         * FIXME: These bindings should be fixed to not rely on overlapping
@@ -2449,16 +2458,6 @@ static int qmp_usb_create(struct qmp_usb *qmp, struct device_node *np)
                                     "failed to get pipe clock\n");
        }
 
-       generic_phy = devm_phy_create(dev, np, &qmp_usb_phy_ops);
-       if (IS_ERR(generic_phy)) {
-               ret = PTR_ERR(generic_phy);
-               dev_err(dev, "failed to create PHY: %d\n", ret);
-               return ret;
-       }
-
-       qmp->phy = generic_phy;
-       phy_set_drvdata(generic_phy, qmp);
-
        return 0;
 }
 
@@ -2480,16 +2479,6 @@ static int qmp_usb_probe(struct platform_device *pdev)
        if (!qmp->cfg)
                return -EINVAL;
 
-       qmp->serdes = devm_platform_ioremap_resource(pdev, 0);
-       if (IS_ERR(qmp->serdes))
-               return PTR_ERR(qmp->serdes);
-
-       if (qmp->cfg->has_phy_dp_com_ctrl) {
-               qmp->dp_com = devm_platform_ioremap_resource(pdev, 1);
-               if (IS_ERR(qmp->dp_com))
-                       return PTR_ERR(qmp->dp_com);
-       }
-
        ret = qmp_usb_clk_init(qmp);
        if (ret)
                return ret;
@@ -2516,7 +2505,7 @@ static int qmp_usb_probe(struct platform_device *pdev)
         */
        pm_runtime_forbid(dev);
 
-       ret = qmp_usb_create(qmp, child);
+       ret = qmp_usb_parse_dt_legacy(qmp, child);
        if (ret)
                goto err_node_put;
 
@@ -2524,6 +2513,15 @@ static int qmp_usb_probe(struct platform_device *pdev)
        if (ret)
                goto err_node_put;
 
+       qmp->phy = devm_phy_create(dev, child, &qmp_usb_phy_ops);
+       if (IS_ERR(qmp->phy)) {
+               ret = PTR_ERR(qmp->phy);
+               dev_err(dev, "failed to create PHY: %d\n", ret);
+               goto err_node_put;
+       }
+
+       phy_set_drvdata(qmp->phy, qmp);
+
        of_node_put(child);
 
        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);