redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

usb: ehci: marvel: check against CONFIG_USB_PHY

Browse source 
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>
This commit is contained in:
Felipe Balbi 2013-03-07 11:24:32 +02:00
parent 1d3dbfc3a7
commit fcd12b9711
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/host/ehci-mv.c
View file

@ -240,7 +240,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
ehci_mv->mode = pdata->mode; ehci_mv->mode = pdata->mode;
if (ehci_mv->mode == MV_USB_MODE_OTG) { 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); ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
if (IS_ERR_OR_NULL(ehci_mv->otg)) { if (IS_ERR_OR_NULL(ehci_mv->otg)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
@ -260,7 +260,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
mv_ehci_disable(ehci_mv); mv_ehci_disable(ehci_mv);
#else #else
dev_info(&pdev->dev, "MV_USB_MODE_OTG " 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; goto err_disable_clk;
#endif #endif
} else { } else {