leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Rini 2017-04-25 09:00:18 -04:00
commit 9fde52a8d4
3 changed files with 4 additions and 3 deletions
drivers/usb
host
ehci-ppc4xx.c
musb-new
musb_uboot.c
musb
musb_udc.c

1
drivers/usb/host/ehci-ppc4xx.c
View File

@ -8,6 +8,7 @@
*/
#include <common.h>
#include <usb.h>
#include <asm/io.h>
#include "ehci.h"

2
drivers/usb/musb-new/musb_uboot.c
View File

@ -446,7 +446,7 @@ int musb_register(struct musb_hdrc_platform_data *plat, void *bdata,
}
*musbp = musb_init_controller(plat, (struct device *)bdata, ctl_regs);
if (!musbp) {
if (!*musbp) {
printf("Failed to init the controller\n");
return -EIO;
}

4
drivers/usb/musb/musb_udc.c
View File

@ -85,7 +85,7 @@ do { \
/* static implies these initialized to 0 or NULL */
static int debug_setup;
static int debug_level;
static struct musb_epinfo epinfo[MAX_ENDPOINT * 2];
static struct musb_epinfo epinfo[MAX_ENDPOINT * 2 + 2];
static enum ep0_state_enum {
IDLE = 0,
TX,
@ -944,7 +944,7 @@ int udc_init(void)
musbr = musb_cfg.regs;
/* Initialize the endpoints */
for (ep_loop = 0; ep_loop < MAX_ENDPOINT * 2; ep_loop++) {
for (ep_loop = 0; ep_loop <= MAX_ENDPOINT * 2; ep_loop++) {
epinfo[ep_loop].epnum = (ep_loop / 2) + 1;
epinfo[ep_loop].epdir = ep_loop % 2; /* OUT, IN */
epinfo[ep_loop].epsize = 0;