[RESEND PATCH v3 4/8] phy: phy-mt65xx-usb3: move clock from phy node into port nodes

[Chunfeng Yun]

On Thu, 2017-03-09 at 13:51 +0530, Kishon Vijay Abraham I wrote:
> Hi,
> 
> On Monday 06 March 2017 07:19 PM, Chunfeng Yun wrote:
> > the reference clock of HighSpeed port is 48M which comes from PLL;
> > the reference clock of SuperSpeed port is 26M which usually comes
> > from 26M oscillator directly, but some SoCs are not, add it for
> > compatibility, and put them into port node for flexibility.
> 
> Won't this break the old dt compatiblity? Making change in dt is fine as long
> as older dtb's are still supported.
Ok, I'll keep it compatible in next version

Thanks a lot
> 
> Thanks
> Kishon
> > 
> > Signed-off-by: Chunfeng Yun <chunfeng.yun at mediatek.com>
> > ---
> >  drivers/phy/phy-mt65xx-usb3.c |   21 +++++++++++----------
> >  1 file changed, 11 insertions(+), 10 deletions(-)
> > 
> > diff --git a/drivers/phy/phy-mt65xx-usb3.c b/drivers/phy/phy-mt65xx-usb3.c
> > index 7fff482..f4a3505 100644
> > --- 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,7 +161,6 @@ struct mt65xx_phy_instance {
> >  struct mt65xx_u3phy {
> >  	struct device *dev;
> >  	void __iomem *sif_base;	/* only shared sif */
> > -	struct clk *u3phya_ref;	/* reference clock of usb3 anolog phy */
> >  	const struct mt65xx_phy_pdata *pdata;
> >  	struct mt65xx_phy_instance **phys;
> >  	int nphys;
> > @@ -449,9 +449,9 @@ static int mt65xx_phy_init(struct phy *phy)
> >  	struct mt65xx_u3phy *u3phy = dev_get_drvdata(phy->dev.parent);
> >  	int ret;
> >  
> > -	ret = clk_prepare_enable(u3phy->u3phya_ref);
> > +	ret = clk_prepare_enable(instance->ref_clk);
> >  	if (ret) {
> > -		dev_err(u3phy->dev, "failed to enable u3phya_ref\n");
> > +		dev_err(u3phy->dev, "failed to enable ref_clk\n");
> >  		return ret;
> >  	}
> >  
> > @@ -494,7 +494,7 @@ static int mt65xx_phy_exit(struct phy *phy)
> >  	if (instance->type == PHY_TYPE_USB2)
> >  		phy_instance_exit(u3phy, instance);
> >  
> > -	clk_disable_unprepare(u3phy->u3phya_ref);
> > +	clk_disable_unprepare(instance->ref_clk);
> >  	return 0;
> >  }
> >  
> > @@ -594,12 +594,6 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev)
> >  		return PTR_ERR(u3phy->sif_base);
> >  	}
> >  
> > -	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);
> > -	}
> > -
> >  	port = 0;
> >  	for_each_child_of_node(np, child_np) {
> >  		struct mt65xx_phy_instance *instance;
> > @@ -634,6 +628,13 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev)
> >  			goto put_child;
> >  		}
> >  
> > +		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;
> > +		}
> > +
> >  		instance->phy = phy;
> >  		instance->index = port;
> >  		phy_set_drvdata(phy, instance);
> >