diff options
| author | Tom Rini <trini@ti.com> | 2014-09-02 20:37:57 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-02 20:37:57 (GMT) |
| commit | 48f892dc7370a23882239be06b4ec2ce60273e57 (patch) | |
| tree | 050d8d28ef207dc8a00cf3f763f4997c66dfaeb9 /drivers/usb/gadget/s3c_udc_otg.c | |
| parent | 2c19478e01ab145c8b3a1f5b1beca9958d942e98 (diff) | |
| parent | 06fa91cd671eae291b05e2138d291c56ddd394df (diff) | |
| download | u-boot-fsl-qoriq-48f892dc7370a23882239be06b4ec2ce60273e57.tar.xz | |
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/gadget/s3c_udc_otg.c')
| -rw-r--r-- | drivers/usb/gadget/s3c_udc_otg.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c index 63d4487..b9816df 100644 --- a/drivers/usb/gadget/s3c_udc_otg.c +++ b/drivers/usb/gadget/s3c_udc_otg.c @@ -149,6 +149,11 @@ struct s3c_usbotg_reg *reg; struct s3c_usbotg_phy *phy; static unsigned int usb_phy_ctrl; +bool dfu_usb_get_reset(void) +{ + return !!(readl(®->gintsts) & INT_RESET); +} + void otg_phy_init(struct s3c_udc *dev) { dev->pdata->phy_control(1); @@ -283,7 +288,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) { struct s3c_udc *dev = the_controller; int retval = 0; - unsigned long flags; + unsigned long flags = 0; debug_cond(DEBUG_SETUP != 0, "%s: %s\n", __func__, "no name"); @@ -331,7 +336,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) { struct s3c_udc *dev = the_controller; - unsigned long flags; + unsigned long flags = 0; if (!dev) return -ENODEV; @@ -575,7 +580,7 @@ static int s3c_ep_enable(struct usb_ep *_ep, { struct s3c_ep *ep; struct s3c_udc *dev; - unsigned long flags; + unsigned long flags = 0; debug("%s: %p\n", __func__, _ep); @@ -639,7 +644,7 @@ static int s3c_ep_enable(struct usb_ep *_ep, static int s3c_ep_disable(struct usb_ep *_ep) { struct s3c_ep *ep; - unsigned long flags; + unsigned long flags = 0; debug("%s: %p\n", __func__, _ep); @@ -697,7 +702,7 @@ static int s3c_dequeue(struct usb_ep *_ep, struct usb_request *_req) { struct s3c_ep *ep; struct s3c_request *req; - unsigned long flags; + unsigned long flags = 0; debug("%s: %p\n", __func__, _ep); |