Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

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

diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c
index 7e3f159..4b133d7 100644 (file)
--- a/arch/arm/mach-omap2/board-zoom.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@ -48,7 +48,7 @@ static void __init omap_zoom_init_early(void)
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
        /* WLAN IRQ - GPIO 162 */
-       OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),
+       OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
        /* WLAN POWER ENABLE - GPIO 101 */
        OMAP3_MUX(CAM_D2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
        /* WLAN SDIO: MMC3 CMD */
@@ -105,10 +105,10 @@ static struct mtd_partition zoom_nand_partitions[] = {
        },
 };
 
-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]     = ZOOM3_EHCI_RESET_GPIO,
@@ -122,7 +122,7 @@ static void __init omap_zoom_init(void)
        } else if (machine_is_omap_zoom3()) {
                omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
                omap_mux_init_gpio(ZOOM3_EHCI_RESET_GPIO, OMAP_PIN_OUTPUT);
-               usb_ehci_init(&ehci_pdata);
+               usbhs_init(&usbhs_bdata);
        }
 
        board_nand_init(zoom_nand_partitions, ARRAY_SIZE(zoom_nand_partitions),