diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:04:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:04:26 -0400 |
| commit | 971f115a50afbe409825c9f3399d5a3b9aca4381 (patch) | |
| tree | cb42dc07a032e325f22b64d961587c081225c6d6 /arch/arm/mach-omap2/board-igep0020.c | |
| parent | 2e270d84223262a38d4755c61d55f5c73ea89e56 (diff) | |
| parent | 500132a0f26ad7d9916102193cbc6c1b1becb373 (diff) | |
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (172 commits)
USB: Add support for SuperSpeed isoc endpoints
xhci: Clean up cycle bit math used during stalls.
xhci: Fix cycle bit calculation during stall handling.
xhci: Update internal dequeue pointers after stalls.
USB: Disable auto-suspend for USB 3.0 hubs.
USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol.
xhci: Return canceled URBs immediately when host is halted.
xhci: Fixes for suspend/resume of shared HCDs.
xhci: Fix re-init on power loss after resume.
xhci: Make roothub functions deal with device removal.
xhci: Limit roothub ports to 15 USB3 & 31 USB2 ports.
xhci: Return a USB 3.0 hub descriptor for USB3 roothub.
xhci: Register second xHCI roothub.
xhci: Change xhci_find_slot_id_by_port() API.
xhci: Refactor bus suspend state into a struct.
xhci: Index with a port array instead of PORTSC addresses.
USB: Set usb_hcd->state and flags for shared roothubs.
usb: Make core allocate resources per PCI-device.
usb: Store bus type in usb_hcd, not in driver flags.
usb: Change usb_hcd->bandwidth_mutex to a pointer.
...
Diffstat (limited to 'arch/arm/mach-omap2/board-igep0020.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-igep0020.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 3be85a1f55f4..f9f534419311 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
| @@ -627,10 +627,10 @@ static struct omap_musb_board_data musb_board_data = { | |||
| 627 | .power = 100, | 627 | .power = 100, |
| 628 | }; | 628 | }; |
| 629 | 629 | ||
| 630 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | 630 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { |
| 631 | .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, | 631 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, |
| 632 | .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 632 | .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, |
| 633 | .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 633 | .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, |
| 634 | 634 | ||
| 635 | .phy_reset = true, | 635 | .phy_reset = true, |
| 636 | .reset_gpio_port[0] = IGEP2_GPIO_USBH_NRESET, | 636 | .reset_gpio_port[0] = IGEP2_GPIO_USBH_NRESET, |
| @@ -699,7 +699,7 @@ static void __init igep2_init(void) | |||
| 699 | platform_add_devices(igep2_devices, ARRAY_SIZE(igep2_devices)); | 699 | platform_add_devices(igep2_devices, ARRAY_SIZE(igep2_devices)); |
| 700 | omap_serial_init(); | 700 | omap_serial_init(); |
| 701 | usb_musb_init(&musb_board_data); | 701 | usb_musb_init(&musb_board_data); |
| 702 | usb_ehci_init(&ehci_pdata); | 702 | usbhs_init(&usbhs_bdata); |
| 703 | 703 | ||
| 704 | igep2_flash_init(); | 704 | igep2_flash_init(); |
| 705 | igep2_leds_init(); | 705 | igep2_leds_init(); |