From 59df93cda0a3c786554b3598abdf320c42035986 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 15 Feb 2013 15:23:38 -0800 Subject: [PATCH] add two usb gadget fixes --- ..._usbhs-gadget-remove-usbhsg_uep_init.patch | 51 +++++++++++++++++++ ...usbhsg_ep_disable-care-pipe-settings.patch | 51 +++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 patches.fixes/revert-usb-renesas_usbhs-gadget-remove-usbhsg_uep_init.patch create mode 100644 patches.fixes/revert-usb-renesas_usbhs-gadget-usbhsg_ep_disable-care-pipe-settings.patch diff --git a/patches.fixes/revert-usb-renesas_usbhs-gadget-remove-usbhsg_uep_init.patch b/patches.fixes/revert-usb-renesas_usbhs-gadget-remove-usbhsg_uep_init.patch new file mode 100644 index 000000000000..0b049e695d59 --- /dev/null +++ b/patches.fixes/revert-usb-renesas_usbhs-gadget-remove-usbhsg_uep_init.patch @@ -0,0 +1,51 @@ +From ltsi-dev-bounces@lists.linuxfoundation.org Tue Feb 12 20:55:41 2013 +From: Do Quang Thang +Date: Wed, 13 Feb 2013 13:23:50 +0900 +Subject: [PATCH 02/10] Revert "usb: renesas_usbhs: gadget: remove usbhsg_uep_init()" +To: ltsi-dev@lists.linuxfoundation.org +Message-ID: <1360729438-10731-3-git-send-email-dq-thang@jinso.co.jp> + + +This reverts commit f1b8894e20b3b92524473ab7e8f2eee3e581d708. + +Signed-off-by: Kuninori Morimoto +Signed-off-by: Simon Horman +Signed-off-by: Do Quang Thang +--- + drivers/usb/renesas_usbhs/mod_gadget.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- a/drivers/usb/renesas_usbhs/mod_gadget.c ++++ b/drivers/usb/renesas_usbhs/mod_gadget.c +@@ -541,6 +541,15 @@ static int usbhsg_pipe_disable(struct us + return 0; + } + ++static void usbhsg_uep_init(struct usbhsg_gpriv *gpriv) ++{ ++ int i; ++ struct usbhsg_uep *uep; ++ ++ usbhsg_for_each_uep_with_dcp(uep, gpriv, i) ++ uep->pipe = NULL; ++} ++ + /* + * + * usb_ep_ops +@@ -748,6 +757,7 @@ static int usbhsg_try_start(struct usbhs + usbhs_pipe_init(priv, + usbhsg_dma_map_ctrl); + usbhs_fifo_init(priv); ++ usbhsg_uep_init(gpriv); + + /* dcp init */ + dcp->pipe = usbhs_dcp_malloc(priv); +@@ -960,7 +970,6 @@ int usbhs_mod_gadget_probe(struct usbhs_ + */ + usbhsg_for_each_uep_with_dcp(uep, gpriv, i) { + uep->gpriv = gpriv; +- uep->pipe = NULL; + snprintf(uep->ep_name, EP_NAME_SIZE, "ep%d", i); + + uep->ep.name = uep->ep_name; diff --git a/patches.fixes/revert-usb-renesas_usbhs-gadget-usbhsg_ep_disable-care-pipe-settings.patch b/patches.fixes/revert-usb-renesas_usbhs-gadget-usbhsg_ep_disable-care-pipe-settings.patch new file mode 100644 index 000000000000..c7ee703d5ba7 --- /dev/null +++ b/patches.fixes/revert-usb-renesas_usbhs-gadget-usbhsg_ep_disable-care-pipe-settings.patch @@ -0,0 +1,51 @@ +From ltsi-dev-bounces@lists.linuxfoundation.org Tue Feb 12 20:55:46 2013 +From: Do Quang Thang +Date: Wed, 13 Feb 2013 13:23:49 +0900 +Subject: [PATCH 01/10] Revert "usb: renesas_usbhs: gadget: usbhsg_ep_disable() care pipe settings" +To: ltsi-dev@lists.linuxfoundation.org +Message-ID: <1360729438-10731-2-git-send-email-dq-thang@jinso.co.jp> + + +This reverts commit 8983431340203180a6712d3ff3da6770a53cedca. + +Signed-off-by: Kuninori Morimoto +Signed-off-by: Simon Horman +Signed-off-by: Do Quang Thang +--- + drivers/usb/renesas_usbhs/mod_gadget.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +--- a/drivers/usb/renesas_usbhs/mod_gadget.c ++++ b/drivers/usb/renesas_usbhs/mod_gadget.c +@@ -597,12 +597,7 @@ static int usbhsg_ep_disable(struct usb_ + { + struct usbhsg_uep *uep = usbhsg_ep_to_uep(ep); + +- usbhsg_pipe_disable(uep); +- +- uep->pipe->mod_private = NULL; +- uep->pipe = NULL; +- +- return 0; ++ return usbhsg_pipe_disable(uep); + } + + static struct usb_request *usbhsg_ep_alloc_request(struct usb_ep *ep, +@@ -754,7 +749,7 @@ static int usbhsg_try_start(struct usbhs + usbhsg_dma_map_ctrl); + usbhs_fifo_init(priv); + +- /* dcp init instead of usbhsg_ep_enable() */ ++ /* dcp init */ + dcp->pipe = usbhs_dcp_malloc(priv); + dcp->pipe->mod_private = dcp; + usbhs_pipe_config_update(dcp->pipe, 0, 0, 64); +@@ -816,7 +811,7 @@ static int usbhsg_try_stop(struct usbhs_ + usbhs_sys_set_test_mode(priv, 0); + usbhs_sys_function_ctrl(priv, 0); + +- usbhsg_ep_disable(&dcp->ep); ++ usbhsg_pipe_disable(dcp); + + dev_dbg(dev, "stop gadget\n"); + -- 2.34.1