phy: phy-snps-eusb2: split phy init code

The current phy init consists of hardware power-up, as well as
QCOM-specific eUSB2 init code. Split it into two parts, to make room
for such non-QCOM init code.

Signed-off-by: Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250504144527.1723980-6-ivo.ivanov.ivanov1@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c
index e1b175f481b4e125530d67d66926c867ad378abf..1933e8440945086a121b49de439e085db654e9d4 100644 (file)
--- a/drivers/phy/phy-snps-eusb2.c
+++ b/drivers/phy/phy-snps-eusb2.c
@@ -121,6 +121,10 @@ static const char * const eusb2_hsphy_vreg_names[] = {
 
 #define EUSB2_NUM_VREGS                ARRAY_SIZE(eusb2_hsphy_vreg_names)
 
+struct snps_eusb2_phy_drvdata {
+       int (*phy_init)(struct phy *p);
+};
+
 struct snps_eusb2_hsphy {
        struct phy *phy;
        void __iomem *base;
@@ -133,6 +137,8 @@ struct snps_eusb2_hsphy {
        enum phy_mode mode;
 
        struct phy *repeater;
+
+       const struct snps_eusb2_phy_drvdata *data;
 };
 
 static int snps_eusb2_hsphy_set_mode(struct phy *p, enum phy_mode mode, int submode)
@@ -230,41 +236,11 @@ static int qcom_eusb2_ref_clk_init(struct snps_eusb2_hsphy *phy)
        return 0;
 }
 
-static int snps_eusb2_hsphy_init(struct phy *p)
+static int qcom_snps_eusb2_hsphy_init(struct phy *p)
 {
        struct snps_eusb2_hsphy *phy = phy_get_drvdata(p);
        int ret;
 
-       ret = regulator_bulk_enable(ARRAY_SIZE(phy->vregs), phy->vregs);
-       if (ret)
-               return ret;
-
-       ret = phy_init(phy->repeater);
-       if (ret) {
-               dev_err(&p->dev, "repeater init failed. %d\n", ret);
-               goto disable_vreg;
-       }
-
-       ret = clk_prepare_enable(phy->ref_clk);
-       if (ret) {
-               dev_err(&p->dev, "failed to enable ref clock, %d\n", ret);
-               goto disable_vreg;
-       }
-
-       ret = reset_control_assert(phy->phy_reset);
-       if (ret) {
-               dev_err(&p->dev, "failed to assert phy_reset, %d\n", ret);
-               goto disable_ref_clk;
-       }
-
-       usleep_range(100, 150);
-
-       ret = reset_control_deassert(phy->phy_reset);
-       if (ret) {
-               dev_err(&p->dev, "failed to de-assert phy_reset, %d\n", ret);
-               goto disable_ref_clk;
-       }
-
        snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG0,
                                    CMN_CTRL_OVERRIDE_EN, CMN_CTRL_OVERRIDE_EN);
 
@@ -334,6 +310,52 @@ static int snps_eusb2_hsphy_init(struct phy *p)
                                    USB2_SUSPEND_N_SEL, 0);
 
        return 0;
+}
+
+static const struct snps_eusb2_phy_drvdata sm8550_snps_eusb2_phy = {
+       .phy_init       = qcom_snps_eusb2_hsphy_init,
+};
+
+static int snps_eusb2_hsphy_init(struct phy *p)
+{
+       struct snps_eusb2_hsphy *phy = phy_get_drvdata(p);
+       int ret;
+
+       ret = regulator_bulk_enable(ARRAY_SIZE(phy->vregs), phy->vregs);
+       if (ret)
+               return ret;
+
+       ret = phy_init(phy->repeater);
+       if (ret) {
+               dev_err(&p->dev, "repeater init failed. %d\n", ret);
+               goto disable_vreg;
+       }
+
+       ret = clk_prepare_enable(phy->ref_clk);
+       if (ret) {
+               dev_err(&p->dev, "failed to enable ref clock, %d\n", ret);
+               goto disable_vreg;
+       }
+
+       ret = reset_control_assert(phy->phy_reset);
+       if (ret) {
+               dev_err(&p->dev, "failed to assert phy_reset, %d\n", ret);
+               goto disable_ref_clk;
+       }
+
+       usleep_range(100, 150);
+
+       ret = reset_control_deassert(phy->phy_reset);
+       if (ret) {
+               dev_err(&p->dev, "failed to de-assert phy_reset, %d\n", ret);
+               goto disable_ref_clk;
+       }
+
+       ret = phy->data->phy_init(p);
+       if (ret)
+               goto disable_ref_clk;
+
+       return 0;
 
 disable_ref_clk:
        clk_disable_unprepare(phy->ref_clk);
@@ -378,6 +400,10 @@ static int snps_eusb2_hsphy_probe(struct platform_device *pdev)
        if (!phy)
                return -ENOMEM;
 
+       phy->data = device_get_match_data(dev);
+       if (!phy->data)
+               return -EINVAL;
+
        phy->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(phy->base))
                return PTR_ERR(phy->base);
@@ -424,8 +450,10 @@ static int snps_eusb2_hsphy_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id snps_eusb2_hsphy_of_match_table[] = {
-       { .compatible = "qcom,sm8550-snps-eusb2-phy", },
-       { },
+       {
+               .compatible = "qcom,sm8550-snps-eusb2-phy",
+               .data = &sm8550_snps_eusb2_phy,
+       }, { },
 };
 MODULE_DEVICE_TABLE(of, snps_eusb2_hsphy_of_match_table);