GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-usb

Browse source
This commit is contained in:
Tom Rini 2017-12-13 17:58:36 -05:00
commit 6b308494c5
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/usb/host/r8a66597-hcd.c
View file

@ -10,6 +10,7 @@
#include <console.h> #include <console.h>
#include <usb.h> #include <usb.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/iopoll.h>
#include "r8a66597.h" #include "r8a66597.h"
@ -297,7 +298,6 @@ static int send_setup_packet(struct r8a66597 *r8a66597, struct usb_device *dev,
int timeout = 3000; int timeout = 3000;
#if defined(CONFIG_RZA_USB) #if defined(CONFIG_RZA_USB)
u16 dcpctr; u16 dcpctr;
int timeout2 = 10000;
#endif #endif
u16 devsel = setup->request == USB_REQ_SET_ADDRESS ? 0 : dev->devnum; u16 devsel = setup->request == USB_REQ_SET_ADDRESS ? 0 : dev->devnum;
@ -308,13 +308,10 @@ static int send_setup_packet(struct r8a66597 *r8a66597, struct usb_device *dev,
#if defined(CONFIG_RZA_USB) #if defined(CONFIG_RZA_USB)
dcpctr = r8a66597_read(r8a66597, DCPCTR); dcpctr = r8a66597_read(r8a66597, DCPCTR);
if ((dcpctr & PID) == PID_BUF) { if ((dcpctr & PID) == PID_BUF) {
timeout2 = 10000; if (readw_poll_timeout(r8a66597->reg + DCPCTR, dcpctr,
while (!(dcpctr & BSTS)) { dcpctr & BSTS, 1000) < 0) {
dcpctr = r8a66597_read(r8a66597, DCPCTR); printf("DCPCTR BSTS timeout!\n");
if (timeout2-- < 0) { return -ETIMEDOUT;
printf("DCPCTR clear timeout!\n");
break;
}
} }
} }
#endif #endif