Skip to content

Commit

Permalink
usb: ehci: marvel: check against CONFIG_USB_PHY
Browse files Browse the repository at this point in the history
CONFIG_USB_OTG_UTILS will be removed very
soon, so we should check CONFIG_USB_PHY
instead.

Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Felipe Balbi committed Mar 18, 2013
1 parent 1d3dbfc commit fcd12b9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/host/ehci-mv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 {
Expand Down

0 comments on commit fcd12b9

Please sign in to comment.