summaryrefslogtreecommitdiff
path: root/drivers/usb/chipidea/ulpi.c
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2018-08-06 10:04:48 +0300
committerStefan Schmidt <stefan@datenfreihafen.org>2018-08-06 10:04:48 +0300
commita30461080366214b690a367225a48c95d7a6a189 (patch)
tree02cd7cfb8cea14cebe1ab2a1638edd8c9b9e0d3f /drivers/usb/chipidea/ulpi.c
parent811e299f4645588cc7a1b78d97b6847c155324b9 (diff)
parent981467033a37d916649647fa3afe1fe99bba1817 (diff)
downloadlinux-a30461080366214b690a367225a48c95d7a6a189.tar.xz
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'drivers/usb/chipidea/ulpi.c')
-rw-r--r--drivers/usb/chipidea/ulpi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/chipidea/ulpi.c b/drivers/usb/chipidea/ulpi.c
index 6da42dcd2888..dfec07e8ae1d 100644
--- a/drivers/usb/chipidea/ulpi.c
+++ b/drivers/usb/chipidea/ulpi.c
@@ -95,6 +95,9 @@ int ci_ulpi_resume(struct ci_hdrc *ci)
{
int cnt = 100000;
+ if (ci->platdata->phy_mode != USBPHY_INTERFACE_MODE_ULPI)
+ return 0;
+
while (cnt-- > 0) {
if (hw_read(ci, OP_ULPI_VIEWPORT, ULPI_SYNC_STATE))
return 0;