Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[linux-beck.git] / arch / arm / mach-omap2 / board-am3517crane.c

diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c
index f53bbb2c34787005631fd9827462005a915f5a58..a890d244fec688fdb93b1e44a7d8e51b35b2a373 100644 (file)
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@ -55,10 +55,10 @@ static void __init am3517_crane_init_early(void)
        omap2_init_common_devices(NULL, NULL);
 }
 
-static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
-       .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
-       .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-       .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+static struct usbhs_omap_board_data usbhs_bdata __initdata = {
+       .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
+       .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
+       .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
 
        .phy_reset  = true,
        .reset_gpio_port[0]  = GPIO_USB_NRESET,
@@ -102,7 +102,7 @@ static void __init am3517_crane_init(void)
                return;
        }
 
-       usb_ehci_init(&ehci_pdata);
+       usbhs_init(&usbhs_bdata);
 }
 
 MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD")