Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

[pandora-kernel.git] / arch / arm / mach-omap2 / board-overo.c

diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 1e17061..59ca333 100644 (file)
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -706,11 +706,10 @@ static void __init overo_init_early(void)
                                  mt46h32m32lf6_sdrc_params);
 }
 
-static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
-       .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-       .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
-       .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-
+static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
+       .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
+       .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
+       .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
        .phy_reset  = true,
        .reset_gpio_port[0]  = -EINVAL,
        .reset_gpio_port[1]  = OVERO_GPIO_USBH_NRESET,
@@ -737,8 +736,9 @@ static void __init overo_init(void)
        omap_serial_init();
        overo_flash_init();
        usb_musb_init(&musb_board_data);
-       usb_ehci_init(&ehci_pdata);
+       usbhs_init(&usbhs_bdata);
        overo_spi_init();
+       overo_ads7846_init();
        overo_init_smsc911x();
        overo_display_init();
        overo_init_led();