aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-03-07 04:24:32 -0500
committerFelipe Balbi <balbi@ti.com>2013-03-18 05:18:06 -0400
commitfcd12b9711816e7cb0a3eb1b47790979e4c14c58 (patch)
treec0c189c33e21ced1c26cd6ee6e75ca251b6e3e19 /drivers/usb
parent1d3dbfc3a74f70750c8385dff36d4d46b6bd3a1a (diff)
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: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-mv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 3065809546b1..9751823395e1 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -240,7 +240,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
240 240
241 ehci_mv->mode = pdata->mode; 241 ehci_mv->mode = pdata->mode;
242 if (ehci_mv->mode == MV_USB_MODE_OTG) { 242 if (ehci_mv->mode == MV_USB_MODE_OTG) {
243#ifdef CONFIG_USB_OTG_UTILS 243#if IS_ENABLED(CONFIG_USB_PHY)
244 ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); 244 ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
245 if (IS_ERR_OR_NULL(ehci_mv->otg)) { 245 if (IS_ERR_OR_NULL(ehci_mv->otg)) {
246 dev_err(&pdev->dev, 246 dev_err(&pdev->dev,
@@ -260,7 +260,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
260 mv_ehci_disable(ehci_mv); 260 mv_ehci_disable(ehci_mv);
261#else 261#else
262 dev_info(&pdev->dev, "MV_USB_MODE_OTG " 262 dev_info(&pdev->dev, "MV_USB_MODE_OTG "
263 "must have CONFIG_USB_OTG_UTILS enabled\n"); 263 "must have CONFIG_USB_PHY enabled\n");
264 goto err_disable_clk; 264 goto err_disable_clk;
265#endif 265#endif
266 } else { 266 } else {