diff options
| author | Li Jun <jun.li@nxp.com> | 2016-08-16 19:19:11 +0800 |
|---|---|---|
| committer | Peter Chen <peter.chen@nxp.com> | 2016-08-19 09:27:07 +0800 |
| commit | c4e94174983a86c935be1537a73e496b778b0287 (patch) | |
| tree | 352061f2bb21d7c4ea8b2fa7c6f288b815a9abdd /drivers/usb/chipidea | |
| parent | f1f6d9a8b540df22b87a5bf6bc104edaade81f47 (diff) | |
| download | talos-obmc-linux-c4e94174983a86c935be1537a73e496b778b0287.tar.gz talos-obmc-linux-c4e94174983a86c935be1537a73e496b778b0287.zip | |
usb: chipidea: udc: don't touch DP when controller is in host mode
When the controller is configured to be dual role and it's in host mode,
if bind udc and gadgt driver, those gadget operations will do gadget
disconnect and finally pull down DP line, which will break host function.
Cc: <stable@vger.kernel.org> # 4.1+
Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Diffstat (limited to 'drivers/usb/chipidea')
| -rw-r--r-- | drivers/usb/chipidea/udc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index 065f5d97aa67..dfec5a176315 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -1596,8 +1596,11 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on) { struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget); - /* Data+ pullup controlled by OTG state machine in OTG fsm mode */ - if (ci_otg_is_fsm_mode(ci)) + /* + * Data+ pullup controlled by OTG state machine in OTG fsm mode; + * and don't touch Data+ in host mode for dual role config. + */ + if (ci_otg_is_fsm_mode(ci) || ci->role == CI_ROLE_HOST) return 0; pm_runtime_get_sync(&ci->gadget.dev); |
