From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jana Rapava Date: Thu, 29 Sep 2011 01:52:49 +0200 Subject: [U-Boot] [PATCH 2/4] EHCI: add callback ehci_fixup In-Reply-To: <1317253971-24558-1-git-send-email-fermata7@gmail.com> References: <1317253971-24558-1-git-send-email-fermata7@gmail.com> Message-ID: <1317253971-24558-3-git-send-email-fermata7@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Add callback to ehci_hcd.c to prepare for solving the problem with VBUS reset on Efika. Signed-off-by: Jana Rapava Cc: Marek Vasut Cc: Remy Bohmer Cc: Stefano Babic Acked-by: Marek Vasut --- drivers/usb/host/ehci-hcd.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index bdadd46..c548276 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -536,6 +536,18 @@ 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 is an alias to __ehci_fixup() unless user provides other definition + * of ehci_fixup function. + */ +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 +721,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, ®); /* terminate the reset */ ehci_writel(status_reg, reg & ~EHCI_PS_PR); /* -- 1.7.6.3