Re: [PATCH] phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly

[Oussama Ghorbel]

You may find merge conflict since v3.17-rc5.
If necessary I can send a re-based version of this patch on v3.17-rc5 
for seamless integration.
In short the line
generic_phy = devm_phy_create(phy->dev, &ops, NULL);
became
generic_phy = devm_phy_create(phy->dev, NULL, &ops, NULL);

Oussama

On 09/24/2014 05:15 PM, Oussama Ghorbel wrote:
> The USB OTG port does not work since v3.16 on omap platform.
> This is a regression introduced by the commit
> eb82a3d846fa (phy: omap-usb2: Balance pm_runtime_enable() on probe failure
>   and remove).
> This because the call to pm_runtime_enable() function is moved after the
> call to devm_phy_create() function, which has side effect since later in
> the subsequent calls of devm_phy_create() there is a check with
> pm_runtime_enabled() to configure few things.
>
> Signed-off-by: Oussama Ghorbel <ghorbel@xxxxxxxxxxxxxxxx>
> ---
>   drivers/phy/phy-omap-usb2.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
> index 34b3961..3fb9293 100644
> --- a/drivers/phy/phy-omap-usb2.c
> +++ b/drivers/phy/phy-omap-usb2.c
> @@ -262,14 +262,16 @@ static int omap_usb2_probe(struct platform_device *pdev)
>   	otg->phy		= &phy->phy;
>   
>   	platform_set_drvdata(pdev, phy);
> +	pm_runtime_enable(phy->dev);
>   
>   	generic_phy = devm_phy_create(phy->dev, &ops, NULL);
> -	if (IS_ERR(generic_phy))
> +	if (IS_ERR(generic_phy)) {
> +		pm_runtime_disable(phy->dev);
>   		return PTR_ERR(generic_phy);
> +	}
>   
>   	phy_set_drvdata(generic_phy, phy);
>   
> -	pm_runtime_enable(phy->dev);
>   	phy_provider = devm_of_phy_provider_register(phy->dev,
>   			of_phy_simple_xlate);
>   	if (IS_ERR(phy_provider)) {

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/