V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

usb: Add an usb_device parameter to usb_reset_root_port 

Add an usb_device parameter to usb_reset_root_port so that it knows which
root-port it is resetting. This is necessary for proper device-model support
for usb_reset_root_port.

Also remove a duplicate declaration of usb_reset_root_port() from usb.h .

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Hans de Goede 2015-06-17 21:33:48 +02:00 committed by Simon Glass
parent 682c9f8dfc
commit 8802f56349
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/usb.c
View File

@ -924,7 +924,7 @@ static int usb_hub_port_reset(struct usb_device *dev, struct usb_device *hub)
return err;
}
} else {
usb_reset_root_port();
usb_reset_root_port(dev);
}
return 0;

2
drivers/usb/host/usb-uclass.c
View File

@ -265,7 +265,7 @@ int usb_init(void)
return usb_started ? 0 : -1;
}
int usb_reset_root_port(void)
int usb_reset_root_port(struct usb_device *udev)
{
return -ENOSYS;
}

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

@ -180,7 +180,7 @@ void *poll_int_queue(struct usb_device *dev, struct int_queue *queue)
return NULL; /* URB still pending */
}
int usb_reset_root_port(void)
int usb_reset_root_port(struct usb_device *dev)
{
void *mbase = host->mregs;
u8 power;
@ -232,7 +232,7 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
if (get_timer(0) >= timeout)
return -ENODEV;
usb_reset_root_port();
usb_reset_root_port(NULL);
host->is_active = 1;
hcd.hcd_priv = host;

8
include/usb.h
View File

@ -175,9 +175,9 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller);
int usb_lowlevel_stop(int index);
#if defined(CONFIG_MUSB_HOST) || defined(CONFIG_DM_USB)
int usb_reset_root_port(void);
int usb_reset_root_port(struct usb_device *dev);
#else
#define usb_reset_root_port()
#define usb_reset_root_port(dev)
#endif
int submit_bulk_msg(struct usb_device *dev, unsigned long pipe,
@ -710,10 +710,6 @@ struct dm_usb_ops {
#define usb_get_ops(dev) ((struct dm_usb_ops *)(dev)->driver->ops)
#define usb_get_emul_ops(dev) ((struct dm_usb_ops *)(dev)->driver->ops)
#ifdef CONFIG_MUSB_HOST
int usb_reset_root_port(void);
#endif
/**
* usb_get_dev_index() - look up a device index number
*