diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom.c')
-rw-r--r-- | arch/arm/mach-omap2/board-zoom.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index e26754c24ee8..1dd195afa396 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c | |||
@@ -106,10 +106,10 @@ static struct mtd_partition zoom_nand_partitions[] = { | |||
106 | }, | 106 | }, |
107 | }; | 107 | }; |
108 | 108 | ||
109 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | 109 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { |
110 | .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 110 | .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, |
111 | .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY, | 111 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, |
112 | .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 112 | .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, |
113 | .phy_reset = true, | 113 | .phy_reset = true, |
114 | .reset_gpio_port[0] = -EINVAL, | 114 | .reset_gpio_port[0] = -EINVAL, |
115 | .reset_gpio_port[1] = ZOOM3_EHCI_RESET_GPIO, | 115 | .reset_gpio_port[1] = ZOOM3_EHCI_RESET_GPIO, |
@@ -123,7 +123,7 @@ static void __init omap_zoom_init(void) | |||
123 | } else if (machine_is_omap_zoom3()) { | 123 | } else if (machine_is_omap_zoom3()) { |
124 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); | 124 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); |
125 | omap_mux_init_gpio(ZOOM3_EHCI_RESET_GPIO, OMAP_PIN_OUTPUT); | 125 | omap_mux_init_gpio(ZOOM3_EHCI_RESET_GPIO, OMAP_PIN_OUTPUT); |
126 | usb_ehci_init(&ehci_pdata); | 126 | usbhs_init(&usbhs_bdata); |
127 | } | 127 | } |
128 | 128 | ||
129 | board_nand_init(zoom_nand_partitions, | 129 | board_nand_init(zoom_nand_partitions, |