Commit 8aa90cf2 authored Nov 13, 2015 by Stefan Wahren Committed by Felipe Balbi Nov 19, 2015

usb: dwc2: make otg clk optional



Fixes commit 09a75e85
("usb: dwc2: refactor common low-level hw code to platform.c")

The above commit consolidated the low-level phy access into a common
location. This change made the otg clk a requirement and broke some
platforms when it was moved into platform.c.

So make clk handling optional again.

Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: John Youn <johnyoun@synopsys.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Fixes: 09a75e85 ("usb: dwc2: refactor common low-level hw code to platform.c")
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent 6c2dad69

drivers/usb/dwc2/platform.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -125,9 +125,11 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
		if (ret)
		return ret;

		if (hsotg->clk) {
		ret = clk_prepare_enable(hsotg->clk);
		if (ret)
		return ret;
		}

		if (hsotg->uphy)
		ret = usb_phy_init(hsotg->uphy);
		@@ -175,6 +177,7 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg)
		if (ret)
		return ret;

		if (hsotg->clk)
		clk_disable_unprepare(hsotg->clk);

		ret = regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),