From 9c22a59cc8a2dd7702ad6ace9458cb6392303f61 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Fri, 8 Feb 2013 17:55:58 +0200 Subject: [PATCH] --- yaml --- r: 364575 b: refs/heads/master c: 9fcb3bd8d12db29c101d3722d37ddef9d1915317 h: refs/heads/master i: 364573: 9927c9b015f1ef539207d57b9f160d4a2bea361d 364571: e1f4860ffeb4abf9160255be9e82fc522704fe26 364567: cf789825b93d00b25fbb8db19def0beb8208ce8a 364559: 5b44d359d63dbb9a3d3716f439aa315f968a2d3a 364543: 0e4ad2a9b4f550caa3691e3c20af2d249b6a3d04 v: v3 --- [refs] | 2 +- trunk/drivers/usb/dwc3/core.h | 1 + trunk/drivers/usb/dwc3/gadget.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7250ebcbaac7..88506f245d34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8698e2acf3a5e8d6f260ca7675f94e5087df5ae8 +refs/heads/master: 9fcb3bd8d12db29c101d3722d37ddef9d1915317 diff --git a/trunk/drivers/usb/dwc3/core.h b/trunk/drivers/usb/dwc3/core.h index b41750660235..35e4d3c01ed0 100644 --- a/trunk/drivers/usb/dwc3/core.h +++ b/trunk/drivers/usb/dwc3/core.h @@ -704,6 +704,7 @@ struct dwc3 { unsigned delayed_status:1; unsigned needs_fifo_resize:1; unsigned resize_fifos:1; + unsigned pullups_connected:1; enum dwc3_ep0_next ep0_next_event; enum dwc3_ep0_state ep0state; diff --git a/trunk/drivers/usb/dwc3/gadget.c b/trunk/drivers/usb/dwc3/gadget.c index db2031725abc..04e4812fe2f9 100644 --- a/trunk/drivers/usb/dwc3/gadget.c +++ b/trunk/drivers/usb/dwc3/gadget.c @@ -1425,8 +1425,10 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on) if (dwc->revision >= DWC3_REVISION_194A) reg &= ~DWC3_DCTL_KEEP_CONNECT; reg |= DWC3_DCTL_RUN_STOP; + dwc->pullups_connected = true; } else { reg &= ~DWC3_DCTL_RUN_STOP; + dwc->pullups_connected = false; } dwc3_writel(dwc->regs, DWC3_DCTL, reg);