Kishon,
On 05/12/18 17:03, Roger Quadros wrote:
> If clk_get() returns -EPROBE_DEFER then we should just
> return instead of falling back to old clock name.
>
> Use clk_prepare_enable() and clk_disable_unprepare() instead
> of splitting up prepare/unprepare from enable/disable.
>
> Signed-off-by: Roger Quadros <rogerq@xxxxxx>
I think you should pick this one for -next independently of the rest
of the series as Tony's ti-sysc patches might cause this issue to trigger
due to re-ordering of devices.
cheers,
-roger
> ---
> drivers/phy/ti/phy-omap-usb2.c | 88 ++++++++++++++++++++++--------------------
> 1 file changed, 47 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/phy/ti/phy-omap-usb2.c b/drivers/phy/ti/phy-omap-usb2.c
> index fe909fd..418e7f1 100644
> --- a/drivers/phy/ti/phy-omap-usb2.c
> +++ b/drivers/phy/ti/phy-omap-usb2.c
> @@ -135,9 +135,9 @@ static int omap_usb_power_on(struct phy *x)
>
> static int omap_usb2_disable_clocks(struct omap_usb *phy)
> {
> - clk_disable(phy->wkupclk);
> + clk_disable_unprepare(phy->wkupclk);
> if (!IS_ERR(phy->optclk))
> - clk_disable(phy->optclk);
> + clk_disable_unprepare(phy->optclk);
>
> return 0;
> }
> @@ -146,14 +146,14 @@ static int omap_usb2_enable_clocks(struct omap_usb *phy)
> {
> int ret;
>
> - ret = clk_enable(phy->wkupclk);
> + ret = clk_prepare_enable(phy->wkupclk);
> if (ret < 0) {
> dev_err(phy->dev, "Failed to enable wkupclk %d\n", ret);
> goto err0;
> }
>
> if (!IS_ERR(phy->optclk)) {
> - ret = clk_enable(phy->optclk);
> + ret = clk_prepare_enable(phy->optclk);
> if (ret < 0) {
> dev_err(phy->dev, "Failed to enable optclk %d\n", ret);
> goto err1;
> @@ -346,63 +346,72 @@ static int omap_usb2_probe(struct platform_device *pdev)
> }
> }
>
> - otg->set_host = omap_usb_set_host;
> - otg->set_peripheral = omap_usb_set_peripheral;
> - if (phy_data->flags & OMAP_USB2_HAS_SET_VBUS)
> - otg->set_vbus = omap_usb_set_vbus;
> - if (phy_data->flags & OMAP_USB2_HAS_START_SRP)
> - otg->start_srp = omap_usb_start_srp;
> - otg->usb_phy = &phy->phy;
> -
> - platform_set_drvdata(pdev, phy);
> - pm_runtime_enable(phy->dev);
> -
> - generic_phy = devm_phy_create(phy->dev, NULL, &ops);
> - if (IS_ERR(generic_phy)) {
> - pm_runtime_disable(phy->dev);
> - return PTR_ERR(generic_phy);
> - }
> -
> - phy_set_drvdata(generic_phy, phy);
> - omap_usb_power_off(generic_phy);
> -
> - phy_provider = devm_of_phy_provider_register(phy->dev,
> - of_phy_simple_xlate);
> - if (IS_ERR(phy_provider)) {
> - pm_runtime_disable(phy->dev);
> - return PTR_ERR(phy_provider);
> - }
>
> phy->wkupclk = devm_clk_get(phy->dev, "wkupclk");
> if (IS_ERR(phy->wkupclk)) {
> - dev_warn(&pdev->dev, "unable to get wkupclk, trying old name\n");
> + if (PTR_ERR(phy->wkupclk) == -EPROBE_DEFER)
> + return -EPROBE_DEFER;
> +
> + dev_warn(&pdev->dev, "unable to get wkupclk %ld, trying old name\n",
> + PTR_ERR(phy->wkupclk));
> 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");
> - pm_runtime_disable(phy->dev);
> + if (PTR_ERR(phy->wkupclk) != -EPROBE_DEFER)
> + 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 DTS\n");
> }
> }
> - clk_prepare(phy->wkupclk);
>
> phy->optclk = devm_clk_get(phy->dev, "refclk");
> if (IS_ERR(phy->optclk)) {
> + if (PTR_ERR(phy->optclk) == -EPROBE_DEFER)
> + return -EPROBE_DEFER;
> +
> dev_dbg(&pdev->dev, "unable to get refclk, trying old name\n");
> phy->optclk = devm_clk_get(phy->dev, "usb_otg_ss_refclk960m");
> +
> if (IS_ERR(phy->optclk)) {
> - dev_dbg(&pdev->dev,
> - "unable to get usb_otg_ss_refclk960m\n");
> + if (PTR_ERR(phy->optclk) != -EPROBE_DEFER) {
> + dev_dbg(&pdev->dev,
> + "unable to get usb_otg_ss_refclk960m\n");
> + }
> } else {
> dev_warn(&pdev->dev,
> "found usb_otg_ss_refclk960m, please fix DTS\n");
> }
> }
>
> - if (!IS_ERR(phy->optclk))
> - clk_prepare(phy->optclk);
> + otg->set_host = omap_usb_set_host;
> + otg->set_peripheral = omap_usb_set_peripheral;
> + if (phy_data->flags & OMAP_USB2_HAS_SET_VBUS)
> + otg->set_vbus = omap_usb_set_vbus;
> + if (phy_data->flags & OMAP_USB2_HAS_START_SRP)
> + otg->start_srp = omap_usb_start_srp;
> + otg->usb_phy = &phy->phy;
> +
> + platform_set_drvdata(pdev, phy);
> + pm_runtime_enable(phy->dev);
> +
> + generic_phy = devm_phy_create(phy->dev, NULL, &ops);
> + if (IS_ERR(generic_phy)) {
> + pm_runtime_disable(phy->dev);
> + return PTR_ERR(generic_phy);
> + }
> +
> + phy_set_drvdata(generic_phy, phy);
> + omap_usb_power_off(generic_phy);
> +
> + phy_provider = devm_of_phy_provider_register(phy->dev,
> + of_phy_simple_xlate);
> + if (IS_ERR(phy_provider)) {
> + pm_runtime_disable(phy->dev);
> + return PTR_ERR(phy_provider);
> + }
> +
>
> usb_add_phy_dev(&phy->phy);
>
> @@ -413,9 +422,6 @@ static int omap_usb2_remove(struct platform_device *pdev)
> {
> struct omap_usb *phy = platform_get_drvdata(pdev);
>
> - clk_unprepare(phy->wkupclk);
> - if (!IS_ERR(phy->optclk))
> - clk_unprepare(phy->optclk);
> usb_remove_phy(&phy->phy);
> pm_runtime_disable(phy->dev);
>
>
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
