From: Stefani Seibold <stefani@seibold.net>
To: linux-kernel@vger.kernel.org, leoli@freescale.com,
tanya.jiang@freescale.com
Subject: [PATCH]: fsl usb gadget driver pullup fix
Date: Fri, 24 Jul 2009 22:00:23 +0200 [thread overview]
Message-ID: <1248465623.30437.24.camel@wall-e> (raw)
Attached is a small fix for the fsl usb gadget driver. This fix the
driver in a way that the usb device will be only "pulled up" on request,
like other usb gadget drivers do.
This is necessary, because the device information is not always
available until an application is up and running which provides this
datas.
Hope you like it.
fsl_udc_core.c | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
Signed-off-by: Stefani Seibold <stefani@seibold.net>
--- linux-2.6.31-rc4.orig/drivers/usb/gadget/fsl_udc_core.c 2009-07-24
20:35:29.000000000 +0200
+++ linux-2.6.31-rc4/drivers/usb/gadget/fsl_udc_core.c 2009-07-24
21:44:10.000000000 +0200
@@ -171,6 +171,21 @@
}
}
+static int can_pullup(struct fsl_udc *udc)
+{
+ return udc->driver && udc->softconnect && udc->vbus_active;
+}
+
+static void set_pullup(struct fsl_udc *udc)
+{
+ if (can_pullup(udc))
+ fsl_writel((fsl_readl(&dr_regs->usbcmd) | USB_CMD_RUN_STOP),
+ &dr_regs->usbcmd);
+ else
+ fsl_writel((fsl_readl(&dr_regs->usbcmd) & ~USB_CMD_RUN_STOP),
+ &dr_regs->usbcmd);
+}
+
/*------------------------------------------------------------------
Internal Hardware related function
------------------------------------------------------------------*/
@@ -283,10 +298,7 @@
temp |= USB_MODE_CTRL_MODE_DEVICE;
fsl_writel(temp, &dr_regs->usbmode);
- /* Set controller to Run */
- temp = fsl_readl(&dr_regs->usbcmd);
- temp |= USB_CMD_RUN_STOP;
- fsl_writel(temp, &dr_regs->usbcmd);
+ set_pullup(udc);
return;
}
@@ -1059,11 +1071,6 @@
return 0;
}
-static int can_pullup(struct fsl_udc *udc)
-{
- return udc->driver && udc->softconnect && udc->vbus_active;
-}
-
/* Notify controller that VBUS is powered, Called by whatever
detects VBUS sessions */
static int fsl_vbus_session(struct usb_gadget *gadget, int is_active)
@@ -1075,12 +1082,7 @@
spin_lock_irqsave(&udc->lock, flags);
VDBG("VBUS %s", is_active ? "on" : "off");
udc->vbus_active = (is_active != 0);
- if (can_pullup(udc))
- fsl_writel((fsl_readl(&dr_regs->usbcmd) | USB_CMD_RUN_STOP),
- &dr_regs->usbcmd);
- else
- fsl_writel((fsl_readl(&dr_regs->usbcmd) & ~USB_CMD_RUN_STOP),
- &dr_regs->usbcmd);
+ set_pullup(udc);
spin_unlock_irqrestore(&udc->lock, flags);
return 0;
}
@@ -1111,12 +1113,7 @@
udc = container_of(gadget, struct fsl_udc, gadget);
udc->softconnect = (is_on != 0);
- if (can_pullup(udc))
- fsl_writel((fsl_readl(&dr_regs->usbcmd) | USB_CMD_RUN_STOP),
- &dr_regs->usbcmd);
- else
- fsl_writel((fsl_readl(&dr_regs->usbcmd) & ~USB_CMD_RUN_STOP),
- &dr_regs->usbcmd);
+ set_pullup(udc);
return 0;
}
@@ -2194,6 +2191,8 @@
udc->resume_state = USB_STATE_NOTATTACHED;
udc->usb_state = USB_STATE_POWERED;
+ udc->vbus_active = 1;
+ udc->softconnect = 1;
udc->ep0_dir = 0;
udc->remote_wakeup = 0; /* default to 0 on reset */
next reply other threads:[~2009-07-24 20:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-24 20:00 Stefani Seibold [this message]
2009-07-25 19:44 ` [PATCH]: fsl usb gadget driver pullup fix Guennadi Liakhovetski
2009-07-25 20:12 ` Stefani Seibold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1248465623.30437.24.camel@wall-e \
--to=stefani@seibold.net \
--cc=leoli@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tanya.jiang@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox