Instead of invoking cdns_sierra_phy_init() from probe, add it in
phy_ops so that it's initialized when the PHY consumer invokes
phy_init()

Signed-off-by: Kishon Vijay Abraham I <kis...@ti.com>
---
 drivers/phy/cadence/phy-cadence-sierra.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/phy/cadence/phy-cadence-sierra.c 
b/drivers/phy/cadence/phy-cadence-sierra.c
index 89a3b732c311..5c617248841f 100644
--- a/drivers/phy/cadence/phy-cadence-sierra.c
+++ b/drivers/phy/cadence/phy-cadence-sierra.c
@@ -174,7 +174,7 @@ static struct regmap_config 
cdns_sierra_phy_config_ctrl_config = {
        .reg_read = cdns_regmap_read,
 };
 
-static void cdns_sierra_phy_init(struct phy *gphy)
+static int cdns_sierra_phy_init(struct phy *gphy)
 {
        struct cdns_sierra_inst *ins = phy_get_drvdata(gphy);
        struct cdns_sierra_phy *phy = dev_get_drvdata(gphy->dev.parent);
@@ -183,6 +183,10 @@ static void cdns_sierra_phy_init(struct phy *gphy)
        struct cdns_reg_pairs *vals;
        u32 num_regs;
 
+       /* Initialise the PHY registers, unless auto configured */
+       if (phy->autoconf)
+               return 0;
+
        if (ins->phy_type == PHY_TYPE_PCIE) {
                num_regs = phy->init_data->pcie_regs;
                vals = phy->init_data->pcie_vals;
@@ -190,7 +194,7 @@ static void cdns_sierra_phy_init(struct phy *gphy)
                num_regs = phy->init_data->usb_regs;
                vals = phy->init_data->usb_vals;
        } else {
-               return;
+               return -EINVAL;
        }
        for (i = 0; i < ins->num_lanes; i++) {
                for (j = 0; j < num_regs ; j++) {
@@ -198,6 +202,8 @@ static void cdns_sierra_phy_init(struct phy *gphy)
                        regmap_write(regmap, vals[j].off, vals[j].val);
                }
        }
+
+       return 0;
 }
 
 static int cdns_sierra_phy_on(struct phy *gphy)
@@ -216,6 +222,7 @@ static int cdns_sierra_phy_off(struct phy *gphy)
 }
 
 static const struct phy_ops ops = {
+       .init           = cdns_sierra_phy_init,
        .power_on       = cdns_sierra_phy_on,
        .power_off      = cdns_sierra_phy_off,
        .owner          = THIS_MODULE,
@@ -436,10 +443,6 @@ static int cdns_sierra_phy_probe(struct platform_device 
*pdev)
                sp->phys[node].phy = gphy;
                phy_set_drvdata(gphy, &sp->phys[node]);
 
-               /* Initialise the PHY registers, unless auto configured */
-               if (!sp->autoconf)
-                       cdns_sierra_phy_init(gphy);
-
                node++;
        }
        sp->nsubnodes = node;
-- 
2.17.1

Reply via email to