1 files changed, 48 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c
index 781ed2558e12..71acb5ab281c 100644
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@ -19,6 +19,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/gpio.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -27,8 +28,14 @@
 
 #include <plat/board.h>
 #include <plat/common.h>
+#include <plat/usb.h>
 
 #include "mux.h"
+#include "control.h"
+
+#define GPIO_USB_POWER          35
+#define GPIO_USB_NRESET         38
+
 
 /* Board initialization */
 static struct omap_board_config_kernel am3517_crane_config[] __initdata = {
@@ -52,10 +59,51 @@ static void __init am3517_crane_init_irq(void)
         omap_init_irq();
 }
 
+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,
+
+        .phy_reset  = true,
+        .reset_gpio_port[0]  = GPIO_USB_NRESET,
+        .reset_gpio_port[1]  = -EINVAL,
+        .reset_gpio_port[2]  = -EINVAL
+};
+
 static void __init am3517_crane_init(void)
 {
+        int ret;
+
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
         omap_serial_init();
+
+        /* Configure GPIO for EHCI port */
+        if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) {
+                pr_err("Can not configure mux for GPIO_USB_NRESET %d\n",
+                        GPIO_USB_NRESET);
+                return;
+        }
+
+        if (omap_mux_init_gpio(GPIO_USB_POWER, OMAP_PIN_OUTPUT)) {
+                pr_err("Can not configure mux for GPIO_USB_POWER %d\n",
+                        GPIO_USB_POWER);
+                return;
+        }
+
+        ret = gpio_request(GPIO_USB_POWER, "usb_ehci_enable");
+        if (ret < 0) {
+                pr_err("Can not request GPIO %d\n", GPIO_USB_POWER);
+                return;
+        }
+
+        ret = gpio_direction_output(GPIO_USB_POWER, 1);
+        if (ret < 0) {
+                gpio_free(GPIO_USB_POWER);
+                pr_err("Unable to initialize EHCI power\n");
+                return;
+        }
+
+        usb_ehci_init(&ehci_pdata);
 }
 
 MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD")