Patchwork [U-Boot,v6,2/4] EHCI: add callback ehci_fixup

login
register
mail settings
Submitter Jana Rapava
Date Sept. 27, 2011, 7:24 p.m.
Message ID <1317151457-15387-1-git-send-email-fermata7@gmail.com>
Download mbox | patch
Permalink /patch/116655/
State Superseded
Headers show

Comments

Jana Rapava - Sept. 27, 2011, 7:24 p.m.
Add callback to ehci_fixup to prepare
for solving the problem with VBUS reset on Efika.

Signed-off-by: Jana Rapava <fermata7@gmail.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Remy Bohmer <linux@bohmer.net>
Cc: Stefano Babic <sbabic@denx.de>
---
Changes for v4:
     - split into patchset
     - add callback ehci_fixup
Changes for v5:
       - make this the second patch in series
       - add comment to alias ehci_fixup
Changes for v6:
	- make the comment a sentence
	- rebase patch on top of u-boot-imx/next

 drivers/usb/host/ehci-hcd.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
Marek Vasut - Sept. 27, 2011, 7:40 p.m.
On Tuesday, September 27, 2011 09:24:15 PM Jana Rapava wrote:
> Add callback to ehci_fixup to prepare
> for solving the problem with VBUS reset on Efika.
> 
> Signed-off-by: Jana Rapava <fermata7@gmail.com>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Remy Bohmer <linux@bohmer.net>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
> Changes for v4:
>      - split into patchset
>      - add callback ehci_fixup
> Changes for v5:
>        - make this the second patch in series
>        - add comment to alias ehci_fixup
> Changes for v6:
> 	- make the comment a sentence
> 	- rebase patch on top of u-boot-imx/next
> 
>  drivers/usb/host/ehci-hcd.c |   13 ++++++++++++-
>  1 files changed, 12 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
> index bdadd46..da09f51 100644
> --- a/drivers/usb/host/ehci-hcd.c
> +++ b/drivers/usb/host/ehci-hcd.c
> @@ -536,6 +536,17 @@ static inline int min3(int a, int b, int c)
>  	return a;
>  }
> 
> +inline void __ehci_fixup(uint32_t *status_reg, uint32_t *reg_ref)
> +{
> +	wait_ms(50);
> +}
> +
> +/* This function will alias to __ehci_fixup,
> + * unless function ehci_fixup is defined somewhere.
> +*/

Dear Jana Rapava,

this is still wrong, the comment starts one line below the opening.

Patch

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index bdadd46..da09f51 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -536,6 +536,17 @@  static inline int min3(int a, int b, int c)
 	return a;
 }
 
+inline void __ehci_fixup(uint32_t *status_reg, uint32_t *reg_ref)
+{
+	wait_ms(50);
+}
+
+/* This function will alias to __ehci_fixup,
+ * unless function ehci_fixup is defined somewhere.
+*/
+void ehci_fixup(uint32_t *status_reg, uint32_t *reg_ref)
+	 __attribute__((weak, alias("__ehci_fixup")));
+
 int
 ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 		 int length, struct devrequest *req)
@@ -709,7 +720,7 @@  ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 				 * usb 2.0 specification say 50 ms resets on
 				 * root
 				 */
-				wait_ms(50);
+				ehci_fixup(status_reg, &reg);
 				/* terminate the reset */
 				ehci_writel(status_reg, reg & ~EHCI_PS_PR);
 				/*