diff options
| author | Fabio Estevam <fabio.estevam@nxp.com> | 2018-07-04 16:09:58 +0300 |
|---|---|---|
| committer | Peter Chen <peter.chen@nxp.com> | 2018-07-05 09:22:47 +0300 |
| commit | a930d8bd94d8db7715d1af74299f710b1fb22fc8 (patch) | |
| tree | 9f5e905ba2d47d7fd6811189331a472e800f63fe /drivers/usb/chipidea/ulpi.c | |
| parent | 90f26cc6bb90b35040f4da0347f480ea9df6e2fc (diff) | |
| download | linux-a930d8bd94d8db7715d1af74299f710b1fb22fc8.tar.xz | |
usb: chipidea: Always build ULPI code
Commit 03e6275ae381 ("usb: chipidea: Fix ULPI on imx51") causes a kernel
hang on imx51 systems that use the ULPI interface and do not select the
CONFIG_USB_CHIPIDEA_ULPI option.
In order to avoid such potential misuse, let's always build the
chipidea ULPI code into the final ci_hdrc object.
Tested on a imx51-babbage board.
Fixes: 03e6275ae381 ("usb: chipidea: Fix ULPI on imx51")
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Diffstat (limited to 'drivers/usb/chipidea/ulpi.c')
| -rw-r--r-- | drivers/usb/chipidea/ulpi.c | 3 |
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; |