diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 10:14:40 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 10:14:40 +0200 |
commit | 12657cb99e1ca670da6a7cace3b238a42003e629 (patch) | |
tree | b3f9c2ffb80e29ef78d79c71b52efe055371c66a /drivers/usb | |
parent | 55e87e07c1c788726423ac617545590cf36c0402 (diff) | |
parent | 706a47fa9c54056d53a42436b9762833756b971b (diff) | |
download | barebox-12657cb99e1ca670da6a7cace3b238a42003e629.tar.gz barebox-12657cb99e1ca670da6a7cace3b238a42003e629.tar.xz |
Merge branch 'for-next/usb'
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/usb.c | 47 | ||||
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 9 |
2 files changed, 46 insertions, 10 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 9a0723a2ed..36fc736fd0 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -431,14 +431,22 @@ static int usb_new_device(struct usb_device *dev) if (dev->descriptor->iSerialNumber) usb_string(dev, dev->descriptor->iSerialNumber, dev->serial, sizeof(dev->serial)); + + if (parent) { + sprintf(dev->dev.name, "%s-%d", parent->dev.name, port); + } else { + sprintf(dev->dev.name, "usb%d", dev->host->busnum); + } + + dev->dev.id = DEVICE_ID_SINGLE; + + register_device(&dev->dev); + /* now prode if the device is a hub */ usb_hub_probe(dev, 0); - sprintf(dev->dev.name, "usb%d-%d", dev->host->busnum, dev->devnum); - print_usb_device(dev); - register_device(&dev->dev); dev_add_param_int_ro(&dev->dev, "iManufacturer", dev->descriptor->iManufacturer, "%d"); dev_add_param_int_ro(&dev->dev, "iProduct", @@ -480,13 +488,18 @@ static struct usb_device *usb_alloc_new_device(void) return usbdev; } -void usb_rescan(void) +int usb_host_detect(struct usb_host *host, int force) { struct usb_device *dev, *tmp; - struct usb_host *host; int ret; + if (host->scanned && !force) + return -EBUSY; + list_for_each_entry_safe(dev, tmp, &usb_device_list, list) { + if (dev->host != host) + continue; + list_del(&dev->list); unregister_device(&dev->dev); if (dev->hub) @@ -496,17 +509,31 @@ void usb_rescan(void) free(dev); } + ret = host->init(host); + if (ret) + return ret; + + dev = usb_alloc_new_device(); + dev->host = host; + usb_new_device(dev); + + host->scanned = 1; + + return 0; +} + +void usb_rescan(int force) +{ + struct usb_host *host; + int ret; + printf("USB: scanning bus for devices...\n"); dev_index = 0; list_for_each_entry(host, &host_list, list) { - ret = host->init(host); + ret = usb_host_detect(host, force); if (ret) continue; - - dev = usb_alloc_new_device(); - dev->host = host; - usb_new_device(dev); } printf("%d USB Device(s) found\n", dev_index); diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 7297e4861e..f44f836357 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -850,6 +850,13 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, return -1; } +static int ehci_detect(struct device_d *dev) +{ + struct ehci_priv *ehci = dev->priv; + + return usb_host_detect(&ehci->host, 0); +} + int ehci_register(struct device_d *dev, struct ehci_data *data) { struct usb_host *host; @@ -885,6 +892,8 @@ int ehci_register(struct device_d *dev, struct ehci_data *data) ehci_reset(ehci); } + dev->detect = ehci_detect; + usb_register_host(host); reg = HC_VERSION(ehci_readl(&ehci->hccr->cr_capbase)); |