phy: phy-mt65xx-usb3: move clock from phy node into port nodes

each port has its own reference clock, the HighSpeed port is 48M,
and the SuperSpeed port is usually 26M, put them into port node for
flexibility, this can close clock if the port is not used.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/phy/phy-mt65xx-usb3.c b/drivers/phy/phy-mt65xx-usb3.c
index 7fff482f498dfca5dcba88636c954ea78133d1c6..34035721cf6276b3b9c323a299eeb8e561f4baf3 100644 (file)
--- a/drivers/phy/phy-mt65xx-usb3.c
+++ b/drivers/phy/phy-mt65xx-usb3.c
@@ -153,6 +153,7 @@ struct mt65xx_phy_pdata {
 struct mt65xx_phy_instance {
        struct phy *phy;
        void __iomem *port_base;
+       struct clk *ref_clk;    /* reference clock of anolog phy */
        u32 index;
        u8 type;
 };
@@ -160,6 +161,7 @@ struct mt65xx_phy_instance {
 struct mt65xx_u3phy {
        struct device *dev;
        void __iomem *sif_base; /* only shared sif */
+       /* deprecated, use @ref_clk instead in phy instance */
        struct clk *u3phya_ref; /* reference clock of usb3 anolog phy */
        const struct mt65xx_phy_pdata *pdata;
        struct mt65xx_phy_instance **phys;
@@ -455,6 +457,12 @@ static int mt65xx_phy_init(struct phy *phy)
                return ret;
        }
 
+       ret = clk_prepare_enable(instance->ref_clk);
+       if (ret) {
+               dev_err(u3phy->dev, "failed to enable ref_clk\n");
+               return ret;
+       }
+
        if (instance->type == PHY_TYPE_USB2)
                phy_instance_init(u3phy, instance);
        else
@@ -494,6 +502,7 @@ static int mt65xx_phy_exit(struct phy *phy)
        if (instance->type == PHY_TYPE_USB2)
                phy_instance_exit(u3phy, instance);
 
+       clk_disable_unprepare(instance->ref_clk);
        clk_disable_unprepare(u3phy->u3phya_ref);
        return 0;
 }
@@ -594,10 +603,13 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev)
                return PTR_ERR(u3phy->sif_base);
        }
 
+       /* it's deprecated, make it optional for backward compatibility */
        u3phy->u3phya_ref = devm_clk_get(dev, "u3phya_ref");
        if (IS_ERR(u3phy->u3phya_ref)) {
-               dev_err(dev, "error to get u3phya_ref\n");
-               return PTR_ERR(u3phy->u3phya_ref);
+               if (PTR_ERR(u3phy->u3phya_ref) == -EPROBE_DEFER)
+                       return -EPROBE_DEFER;
+
+               u3phy->u3phya_ref = NULL;
        }
 
        port = 0;
@@ -638,6 +650,17 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev)
                instance->index = port;
                phy_set_drvdata(phy, instance);
                port++;
+
+               /* if deprecated clock is provided, ignore instance's one */
+               if (u3phy->u3phya_ref)
+                       continue;
+
+               instance->ref_clk = devm_clk_get(&phy->dev, "ref");
+               if (IS_ERR(instance->ref_clk)) {
+                       dev_err(dev, "failed to get ref_clk(id-%d)\n", port);
+                       retval = PTR_ERR(instance->ref_clk);
+                       goto put_child;
+               }
        }
 
        provider = devm_of_phy_provider_register(dev, mt65xx_phy_xlate);