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 7d3358b2e593..fc53911d0d13 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 = { | |||
47 | }; | 47 | }; |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | static struct usbhs_phy_data phy_data[] __initdata = { | ||
51 | { | ||
52 | .port = 1, | ||
53 | .reset_gpio = GPIO_USB_NRESET, | ||
54 | .vcc_gpio = GPIO_USB_POWER, | ||
55 | .vcc_polarity = 1, | ||
56 | }, | ||
57 | }; | ||
58 | |||
50 | static struct usbhs_omap_platform_data usbhs_bdata __initdata = { | 59 | static struct usbhs_omap_platform_data usbhs_bdata __initdata = { |
51 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, | 60 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, |
52 | .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, | ||
53 | .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, | ||
54 | |||
55 | .phy_reset = true, | ||
56 | .reset_gpio_port[0] = GPIO_USB_NRESET, | ||
57 | .reset_gpio_port[1] = -EINVAL, | ||
58 | .reset_gpio_port[2] = -EINVAL | ||
59 | }; | 61 | }; |
60 | 62 | ||
61 | static struct mtd_partition crane_nand_partitions[] = { | 63 | static struct mtd_partition crane_nand_partitions[] = { |
@@ -131,13 +133,7 @@ static void __init am3517_crane_init(void) | |||
131 | return; | 133 | return; |
132 | } | 134 | } |
133 | 135 | ||
134 | ret = gpio_request_one(GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH, | 136 | usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data)); |
135 | "usb_ehci_enable"); | ||
136 | if (ret < 0) { | ||
137 | pr_err("Can not request GPIO %d\n", GPIO_USB_POWER); | ||
138 | return; | ||
139 | } | ||
140 | |||
141 | usbhs_init(&usbhs_bdata); | 137 | usbhs_init(&usbhs_bdata); |
142 | am35xx_emac_init(AM35XX_DEFAULT_MDIO_FREQUENCY, 1); | 138 | am35xx_emac_init(AM35XX_DEFAULT_MDIO_FREQUENCY, 1); |
143 | } | 139 | } |