From 3466a7c464963ae715ea8fa0b3ad0f66cb0331a0 Mon Sep 17 00:00:00 2001 From: vikram pandita Date: Wed, 17 Feb 2010 14:09:23 -0800 Subject: [PATCH] --- yaml --- r: 184729 b: refs/heads/master c: 31e464cdbc11c7872901851f06eff6d67edfcff5 h: refs/heads/master i: 184727: 44bbdeac746e38f4de59c95474de8394cc240728 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-zoom3.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 30a5aab0ba91..dd279bb178c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80c20d543d142ee54ec85259b77aaf0b83c32db5 +refs/heads/master: 31e464cdbc11c7872901851f06eff6d67edfcff5 diff --git a/trunk/arch/arm/mach-omap2/board-zoom3.c b/trunk/arch/arm/mach-omap2/board-zoom3.c index 5e208942ca71..d3e3cd5170d1 100644 --- a/trunk/arch/arm/mach-omap2/board-zoom3.c +++ b/trunk/arch/arm/mach-omap2/board-zoom3.c @@ -20,6 +20,7 @@ #include #include +#include #include "mux.h" #include "sdram-hynix-h8mbx00u0mer-0em.h" @@ -51,11 +52,24 @@ static struct omap_board_mux board_mux[] __initdata = { #define board_mux NULL #endif +static 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, + .phy_reset = true, + .reset_gpio_port[0] = -EINVAL, + .reset_gpio_port[1] = 64, + .reset_gpio_port[2] = -EINVAL, +}; + static void __init omap_zoom_init(void) { omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); zoom_peripherals_init(); zoom_debugboard_init(); + + omap_mux_init_gpio(64, OMAP_PIN_OUTPUT); + usb_ehci_init(&ehci_pdata); } MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")