diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517crane.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-am3517crane.c | 24 | 
1 files changed, 10 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c index 7d3358b2e59..fc53911d0d1 100644 --- a/arch/arm/mach-omap2/board-am3517crane.c +++ b/arch/arm/mach-omap2/board-am3517crane.c @@ -47,15 +47,17 @@ static struct omap_board_mux board_mux[] __initdata = {  };  #endif +static struct usbhs_phy_data phy_data[] __initdata = { +	{ +		.port = 1, +		.reset_gpio = GPIO_USB_NRESET, +		.vcc_gpio = GPIO_USB_POWER, +		.vcc_polarity = 1, +	}, +}; +  static struct usbhs_omap_platform_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, -	.reset_gpio_port[1]  = -EINVAL, -	.reset_gpio_port[2]  = -EINVAL  };  static struct mtd_partition crane_nand_partitions[] = { @@ -131,13 +133,7 @@ static void __init am3517_crane_init(void)  		return;  	} -	ret = gpio_request_one(GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH, -			       "usb_ehci_enable"); -	if (ret < 0) { -		pr_err("Can not request GPIO %d\n", GPIO_USB_POWER); -		return; -	} - +	usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));  	usbhs_init(&usbhs_bdata);  	am35xx_emac_init(AM35XX_DEFAULT_MDIO_FREQUENCY, 1);  }  |