diff options
author | Zhang Sanshan <b51434@freescale.com> | 2015-11-20 10:23:29 +0800 |
---|---|---|
committer | Zhang Sanshan <b51434@freescale.com> | 2015-11-20 12:16:34 +0800 |
commit | 7ca93a9d192bd31b03d55abcdeb03631c137a1bf (patch) | |
tree | 9391484f59a70017f0ccfe5c1cb40083c7c259a3 | |
parent | 9f97da53b791c6590a51208bfeb2265efaf7fdae (diff) | |
download | freescale-7ca93a9d192bd31b03d55abcdeb03631c137a1bf.tar.gz |
MA-7293 Support compiling zImage with imx_v7_mfg_defconfig in android imx 3.14 branch
When use zImage compiled with android imx_3.14 branch in mfgtool,
It will show erro "No device connected"
The root cause is DP is not pull up.
This patch distinguish mfgtool zImage and android zImage with macro CONFIG_FSL_UTP.
Signed-off-by: Zhang Sanshan <b51434@freescale.com>
-rw-r--r-- | drivers/usb/chipidea/udc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index f63886dba8c..dbc7a2cc365 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -1766,7 +1766,6 @@ static int ci_udc_start(struct usb_gadget *gadget, ci_hdrc_otg_fsm_start(ci); return retval; } - if (ci->vbus_active) { pm_runtime_get_sync(&gadget->dev); hw_device_reset(ci); @@ -1774,8 +1773,9 @@ static int ci_udc_start(struct usb_gadget *gadget, /* interrupt, error, port change, reset, sleep/suspend */ hw_write(ci, OP_USBINTR, ~0, USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI); + if (IS_ENABLED(CONFIG_FSL_UTP)) + hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS); } - return retval; } |