summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dfu/dfu.c31
-rw-r--r--drivers/usb/gadget/atmel_usba_udc.c12
-rw-r--r--drivers/usb/gadget/ci_udc.c7
-rw-r--r--drivers/usb/gadget/f_dfu.c2
-rw-r--r--drivers/usb/gadget/s3c_udc_otg.c15
-rw-r--r--drivers/usb/gadget/s3c_udc_otg_xfer_dma.c6
6 files changed, 53 insertions, 20 deletions
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 3512b149c5..55e6a83b9a 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -17,20 +17,41 @@
#include <linux/list.h>
#include <linux/compiler.h>
-static bool dfu_reset_request;
+static bool dfu_detach_request;
static LIST_HEAD(dfu_list);
static int dfu_alt_num;
static int alt_num_cnt;
static struct hash_algo *dfu_hash_algo;
-bool dfu_reset(void)
+/*
+ * The purpose of the dfu_usb_get_reset() function is to
+ * provide information if after USB_DETACH request
+ * being sent the dfu-util performed reset of USB
+ * bus.
+ *
+ * Described behaviour is the only way to distinct if
+ * user has typed -e (detach) or -R (reset) when invoking
+ * dfu-util command.
+ *
+ */
+__weak bool dfu_usb_get_reset(void)
+{
+ return true;
+}
+
+bool dfu_detach(void)
+{
+ return dfu_detach_request;
+}
+
+void dfu_trigger_detach(void)
{
- return dfu_reset_request;
+ dfu_detach_request = true;
}
-void dfu_trigger_reset()
+void dfu_clear_detach(void)
{
- dfu_reset_request = true;
+ dfu_detach_request = false;
}
static int dfu_find_alt_num(const char *s)
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 2c709738a3..12628effe8 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -171,7 +171,7 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
{
struct usba_ep *ep = to_usba_ep(_ep);
struct usba_udc *udc = ep->udc;
- unsigned long flags, ept_cfg, maxpacket;
+ unsigned long flags = 0, ept_cfg, maxpacket;
unsigned int nr_trans;
DBG(DBG_GADGET, "%s: ep_enable: desc=%p\n", ep->ep.name, desc);
@@ -274,7 +274,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
struct usba_ep *ep = to_usba_ep(_ep);
struct usba_udc *udc = ep->udc;
LIST_HEAD(req_list);
- unsigned long flags;
+ unsigned long flags = 0;
DBG(DBG_GADGET, "ep_disable: %s\n", ep->ep.name);
@@ -339,7 +339,7 @@ usba_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
struct usba_request *req = to_usba_req(_req);
struct usba_ep *ep = to_usba_ep(_ep);
struct usba_udc *udc = ep->udc;
- unsigned long flags;
+ unsigned long flags = 0;
int ret;
DBG(DBG_GADGET | DBG_QUEUE | DBG_REQ, "%s: queue req %p, len %u\n",
@@ -401,7 +401,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
static int usba_ep_set_halt(struct usb_ep *_ep, int value)
{
struct usba_ep *ep = to_usba_ep(_ep);
- unsigned long flags;
+ unsigned long flags = 0;
int ret = 0;
DBG(DBG_GADGET, "endpoint %s: %s HALT\n", ep->ep.name,
@@ -480,7 +480,7 @@ static int usba_udc_get_frame(struct usb_gadget *gadget)
static int usba_udc_wakeup(struct usb_gadget *gadget)
{
struct usba_udc *udc = to_usba_udc(gadget);
- unsigned long flags;
+ unsigned long flags = 0;
u32 ctrl;
int ret = -EINVAL;
@@ -499,7 +499,7 @@ static int
usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
{
struct usba_udc *udc = to_usba_udc(gadget);
- unsigned long flags;
+ unsigned long flags = 0;
spin_lock_irqsave(&udc->lock, flags);
if (is_selfpowered)
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 4cd19c3afd..2572b346eb 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -919,3 +919,10 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
return 0;
}
+
+bool dfu_usb_get_reset(void)
+{
+ struct ci_udc *udc = (struct ci_udc *)controller.ctrl->hcor;
+
+ return !!(readl(&udc->usbsts) & STS_URI);
+}
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index 9863dec44d..3e4f02932b 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -372,7 +372,7 @@ static int state_dfu_idle(struct f_dfu *f_dfu,
to_runtime_mode(f_dfu);
f_dfu->dfu_state = DFU_STATE_appIDLE;
- dfu_trigger_reset();
+ dfu_trigger_detach();
break;
default:
f_dfu->dfu_state = DFU_STATE_dfuERROR;
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 63d4487a9b..b9816dfe30 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(&reg->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);
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index 06dfeed905..4f69b22a25 100644
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -466,7 +466,7 @@ static int s3c_udc_irq(int irq, void *_dev)
struct s3c_udc *dev = _dev;
u32 intr_status;
u32 usb_status, gintmsk;
- unsigned long flags;
+ unsigned long flags = 0;
spin_lock_irqsave(&dev->lock, flags);
@@ -585,7 +585,7 @@ static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
struct s3c_request *req;
struct s3c_ep *ep;
struct s3c_udc *dev;
- unsigned long flags;
+ unsigned long flags = 0;
u32 ep_num, gintsts;
req = container_of(_req, struct s3c_request, req);
@@ -1033,7 +1033,7 @@ static int s3c_udc_set_halt(struct usb_ep *_ep, int value)
{
struct s3c_ep *ep;
struct s3c_udc *dev;
- unsigned long flags;
+ unsigned long flags = 0;
u8 ep_num;
ep = container_of(_ep, struct s3c_ep, ep);
View Lorry Controller Status