Commit 8ef85884 authored Aug 23, 2022 by Heiner Kallweit Committed by Greg Kroah-Hartman Sep 15, 2022

usb: dwc2: fix wrong order of phy_power_on and phy_init



commit f9b995b49a07bd0d43b0e490f59be84415c745ae upstream.

Since 1599069a62c6 ("phy: core: Warn when phy_power_on is called before
phy_init") the driver complains. In my case (Amlogic SoC) the warning
is: phy phy-fe03e000.phy.2: phy_power_on was called before phy_init
So change the order of the two calls. The same change has to be done
to the order of phy_exit() and phy_power_off().

Fixes: 09a75e85 ("usb: dwc2: refactor common low-level hw code to platform.c")
Cc: stable@vger.kernel.org
Acked-by: Minas Harutyunyan <hminas@synopsys.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/dfcc6b40-2274-4e86-e73c-5c5e6aa3e046@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 08f27a24

drivers/usb/dwc2/platform.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -142,9 +142,9 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
		} else if (hsotg->plat && hsotg->plat->phy_init) {
		ret = hsotg->plat->phy_init(pdev, hsotg->plat->phy_type);
		} else {
		ret = phy_power_on(hsotg->phy);
		if (ret == 0)
		ret = phy_init(hsotg->phy);
		if (ret == 0)
		ret = phy_power_on(hsotg->phy);
		}

		return ret;
		@@ -176,9 +176,9 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg)
		} else if (hsotg->plat && hsotg->plat->phy_exit) {
		ret = hsotg->plat->phy_exit(pdev, hsotg->plat->phy_type);
		} else {
		ret = phy_exit(hsotg->phy);
		if (ret == 0)
		ret = phy_power_off(hsotg->phy);
		if (ret == 0)
		ret = phy_exit(hsotg->phy);
		}
		if (ret)
		return ret;