Re: [PATCH v2 3/7] phy: omap-usb2: Use generic clock names "wkupclk" and "refclk"

[Felipe Balbi]

Hi,

On Mon, Apr 28, 2014 at 05:01:23PM +0300, Roger Quadros wrote:
> As clocks might be named differently on multiple platforms, use a generic
> name in the driver and allow device tree node to specify the platform
> specific clock name.
> 
> Signed-off-by: Roger Quadros <rog...@ti.com>
> ---
>  drivers/phy/phy-omap-usb2.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
> index a2205a8..fb5e515 100644
> --- a/drivers/phy/phy-omap-usb2.c
> +++ b/drivers/phy/phy-omap-usb2.c
> @@ -275,16 +275,16 @@ static int omap_usb2_probe(struct platform_device *pdev)
>       if (IS_ERR(phy_provider))
>               return PTR_ERR(phy_provider);
>  
> -     phy->wkupclk = devm_clk_get(phy->dev, "usb_phy_cm_clk32k");
> +     phy->wkupclk = devm_clk_get(phy->dev, "wkupclk");

doesn't this patch cause a regression ? I mean, you're changing the
clock name before fixing DTS. Also, that DTS has been in a major version
of the kernel, so we need to maintain compatibility with it. How about:

        phy->wkupclk = devm_clk_get(phy->dev, "wkupclk");
        if (IS_ERR(phy->wkupclk)) {
                dev_err(&pdev->dev, "unable to get wkupclk, trying old name\n");
                phy->wkupclk = devm_clk_get(phy->dev, "usb_phy_cm_clk32k");
                if (IS_ERR(phy->wkupclk)) {
                        dev_err(&pdev->dev, "unable to get 
usb_phy_cm_clk32k\n");
                        return PTR_ERR(phy->wkupclk);
                } else {
                        dev_warn(&pdev->dev, "found usb_phy_cm_clk32k, please 
fix your DTS\n");
                }
        }

a bit ugly, but at least we don't cause any regressions. Likewise for
other clocks.

-- 
balbi

signature.asc
Description: Digital signature