Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcd12b97 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: ehci: marvel: check against CONFIG_USB_PHY 



CONFIG_USB_OTG_UTILS will be removed very
soon, so we should check CONFIG_USB_PHY
instead.

Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 1d3dbfc3

drivers/usb/host/ehci-mv.c

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int mv_ehci_probe(struct platform_device *pdev) 


	ehci_mv->mode = pdata->mode;

	if (ehci_mv->mode == MV_USB_MODE_OTG) {

#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

		ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);

		if (IS_ERR_OR_NULL(ehci_mv->otg)) {

			dev_err(&pdev->dev,
@@ -260,7 +260,7 @@ static int mv_ehci_probe(struct platform_device *pdev) 
		mv_ehci_disable(ehci_mv);

#else

		dev_info(&pdev->dev, "MV_USB_MODE_OTG "

			 "must have CONFIG_USB_OTG_UTILS enabled\n");

			 "must have CONFIG_USB_PHY enabled\n");

		goto err_disable_clk;

#endif

	} else {