diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 0b34beded11f..241e632a4662 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -681,11 +681,11 @@ static struct platform_device *omap3pandora_devices[] __initdata = { | |||
681 | &pandora_vwlan_device, | 681 | &pandora_vwlan_device, |
682 | }; | 682 | }; |
683 | 683 | ||
684 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | 684 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { |
685 | 685 | ||
686 | .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, | 686 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, |
687 | .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 687 | .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, |
688 | .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 688 | .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, |
689 | 689 | ||
690 | .phy_reset = true, | 690 | .phy_reset = true, |
691 | .reset_gpio_port[0] = 16, | 691 | .reset_gpio_port[0] = 16, |
@@ -716,7 +716,7 @@ static void __init omap3pandora_init(void) | |||
716 | spi_register_board_info(omap3pandora_spi_board_info, | 716 | spi_register_board_info(omap3pandora_spi_board_info, |
717 | ARRAY_SIZE(omap3pandora_spi_board_info)); | 717 | ARRAY_SIZE(omap3pandora_spi_board_info)); |
718 | omap3pandora_ads7846_init(); | 718 | omap3pandora_ads7846_init(); |
719 | usb_ehci_init(&ehci_pdata); | 719 | usb_ehci_init(&usbhs_bdata); |
720 | usb_musb_init(&musb_board_data); | 720 | usb_musb_init(&musb_board_data); |
721 | gpmc_nand_init(&pandora_nand_data); | 721 | gpmc_nand_init(&pandora_nand_data); |
722 | 722 | ||