lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: renesas_usbhs: fixup connection fail

Browse Source 
Sometimes the connection fail happen on renesas_usbhs.
This patch fix it up.

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kuninori Morimoto
2011-06-09 16:48:25 +09:00
committed by Greg Kroah-Hartman
parent dcc8545790
commit 08e6c61112
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/renesas_usbhs/mod_gadget.c
View File

@@ -462,8 +462,11 @@ static int usbhsg_ep_enable(struct usb_ep *ep,
* if it already have pipe, * if it already have pipe,
* nothing to do * nothing to do
*/ */
if (uep->pipe) if (uep->pipe) {
usbhs_pipe_clear(uep->pipe);
usbhs_pipe_clear_sequence(uep->pipe);
return 0; return 0;
}
pipe = usbhs_pipe_malloc(priv, desc); pipe = usbhs_pipe_malloc(priv, desc);
if (pipe) { if (pipe) {

9
drivers/usb/renesas_usbhs/pipe.c
View File

@@ -500,6 +500,12 @@ void usbhs_pipe_clear_sequence(struct usbhs_pipe *pipe)
usbhsp_pipectrl_set(pipe, SQCLR, SQCLR); usbhsp_pipectrl_set(pipe, SQCLR, SQCLR);
} }
void usbhs_pipe_clear(struct usbhs_pipe *pipe)
{
usbhsp_pipectrl_set(pipe, ACLRM, ACLRM);
usbhsp_pipectrl_set(pipe, ACLRM, 0);
}
static struct usbhs_pipe *usbhsp_get_pipe(struct usbhs_priv *priv, u32 type) static struct usbhs_pipe *usbhsp_get_pipe(struct usbhs_priv *priv, u32 type)
{ {
struct usbhs_pipe *pos, *pipe; struct usbhs_pipe *pos, *pipe;
@@ -568,8 +574,7 @@ void usbhs_pipe_init(struct usbhs_priv *priv,
INIT_LIST_HEAD(&pipe->list); INIT_LIST_HEAD(&pipe->list);
/* pipe force init */ /* pipe force init */
usbhsp_pipectrl_set(pipe, ACLRM, ACLRM); usbhs_pipe_clear(pipe);
usbhsp_pipectrl_set(pipe, ACLRM, 0);
} }
info->done = done; info->done = done;

1
drivers/usb/renesas_usbhs/pipe.h
View File

@@ -87,6 +87,7 @@ void usbhs_pipe_init(struct usbhs_priv *priv,
int (*dma_map_ctrl)(struct usbhs_pkt *pkt, int map)); int (*dma_map_ctrl)(struct usbhs_pkt *pkt, int map));
int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe); int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe);
void usbhs_pipe_clear_sequence(struct usbhs_pipe *pipe); void usbhs_pipe_clear_sequence(struct usbhs_pipe *pipe);
void usbhs_pipe_clear(struct usbhs_pipe *pipe);
int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe); int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe);
void usbhs_pipe_enable(struct usbhs_pipe *pipe); void usbhs_pipe_enable(struct usbhs_pipe *pipe);
void usbhs_pipe_disable(struct usbhs_pipe *pipe); void usbhs_pipe_disable(struct usbhs_pipe *pipe);