Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3a0bac0676d7f433c12389fc0bc574f048f921c3

Authored by Alessandro Rubini
Committed by Greg Kroah-Hartman
1 parent 0dd2b62ada
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

usb: add support for STA2X11 host driver 

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com>
Cc: Alan Cox <alan@linux.intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 2 changed files with 10 additions and 0 deletions Side-by-side Diff

drivers/usb/host/ehci-pci.c
Diff comments   View file @ 3a0bac0
... ... @@ -276,6 +276,9 @@
276 276  
277 277 /* Serial Bus Release Number is at PCI 0x60 offset */
278 278 pci_read_config_byte(pdev, 0x60, &ehci->sbrn);
  279 + if (pdev->vendor == PCI_VENDOR_ID_STMICRO
  280 + && pdev->device == PCI_DEVICE_ID_STMICRO_USB_HOST)
  281 + ehci->sbrn = 0x20; /* ConneXT has no sbrn register */
279 282  
280 283 /* Keep this around for a while just in case some EHCI
281 284 * implementation uses legacy PCI PM support. This test
... ... @@ -526,6 +529,9 @@
526 529 /* handle any USB 2.0 EHCI controller */
527 530 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
528 531 .driver_data = (unsigned long) &ehci_pci_hc_driver,
  532 + }, {
  533 + PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_HOST),
  534 + .driver_data = (unsigned long) &ehci_pci_hc_driver,
529 535 },
530 536 { /* end: all zeroes */ }
531 537 };
drivers/usb/host/ohci-pci.c
Diff comments   View file @ 3a0bac0
... ... @@ -397,6 +397,10 @@
397 397 /* handle any USB OHCI controller */
398 398 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
399 399 .driver_data = (unsigned long) &ohci_pci_hc_driver,
  400 + }, {
  401 + /* The device in the ConneXT I/O hub has no class reg */
  402 + PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_OHCI),
  403 + .driver_data = (unsigned long) &ohci_pci_hc_driver,
400 404 }, { /* end: all zeroes */ }
401 405 };
402 406 MODULE_DEVICE_TABLE (pci, pci_ids);