Commit 4a2ee5da authored by Roger Quadros's avatar Roger Quadros Committed by Tony Lindgren

ARM: OMAP: AM3517crane: Adapt to ehci-omap changes

Use usbhs_init_phys() to register the PHY's VCC and RESET
regulators and the NOP PHY device.
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 63e135a7
...@@ -47,15 +47,17 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -47,15 +47,17 @@ static struct omap_board_mux board_mux[] __initdata = {
}; };
#endif #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 = { static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, .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[] = { static struct mtd_partition crane_nand_partitions[] = {
...@@ -131,13 +133,7 @@ static void __init am3517_crane_init(void) ...@@ -131,13 +133,7 @@ static void __init am3517_crane_init(void)
return; return;
} }
ret = gpio_request_one(GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH, usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));
"usb_ehci_enable");
if (ret < 0) {
pr_err("Can not request GPIO %d\n", GPIO_USB_POWER);
return;
}
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
am35xx_emac_init(AM35XX_DEFAULT_MDIO_FREQUENCY, 1); am35xx_emac_init(AM35XX_DEFAULT_MDIO_FREQUENCY, 1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment