diff options
author | Roger Quadros <rogerq@ti.com> | 2013-03-20 11:44:51 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-04-02 12:59:58 -0400 |
commit | 9c4d678e7452af7b07c7e2ba4c7712bf4aa004a4 (patch) | |
tree | 15727831e61a44aff04a6cfaadeaee11e563a034 | |
parent | e3d38f9b07efba8a9c6412138f9309d21a87d39d (diff) |
ARM: OMAP3: igep0020: Adapt to ehci-omap changes
Use usbhs_init_phys() to register the PHY's RESET regulators
and the NOP PHY devices.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/board-igep0020.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index bf92678a01d0..95ccec0eeab9 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
@@ -527,26 +527,28 @@ static void __init igep_i2c_init(void) | |||
527 | omap3_pmic_init("twl4030", &igep_twldata); | 527 | omap3_pmic_init("twl4030", &igep_twldata); |
528 | } | 528 | } |
529 | 529 | ||
530 | static struct usbhs_phy_data igep2_phy_data[] __initdata = { | ||
531 | { | ||
532 | .port = 1, | ||
533 | .reset_gpio = IGEP2_GPIO_USBH_NRESET, | ||
534 | .vcc_gpio = -EINVAL, | ||
535 | }, | ||
536 | }; | ||
537 | |||
538 | static struct usbhs_phy_data igep3_phy_data[] __initdata = { | ||
539 | { | ||
540 | .port = 2, | ||
541 | .reset_gpio = IGEP3_GPIO_USBH_NRESET, | ||
542 | .vcc_gpio = -EINVAL, | ||
543 | }, | ||
544 | }; | ||
545 | |||
530 | static struct usbhs_omap_platform_data igep2_usbhs_bdata __initdata = { | 546 | static struct usbhs_omap_platform_data igep2_usbhs_bdata __initdata = { |
531 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, | 547 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, |
532 | .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, | ||
533 | .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, | ||
534 | |||
535 | .phy_reset = true, | ||
536 | .reset_gpio_port[0] = IGEP2_GPIO_USBH_NRESET, | ||
537 | .reset_gpio_port[1] = -EINVAL, | ||
538 | .reset_gpio_port[2] = -EINVAL, | ||
539 | }; | 548 | }; |
540 | 549 | ||
541 | static struct usbhs_omap_platform_data igep3_usbhs_bdata __initdata = { | 550 | static struct usbhs_omap_platform_data igep3_usbhs_bdata __initdata = { |
542 | .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, | ||
543 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, | 551 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, |
544 | .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, | ||
545 | |||
546 | .phy_reset = true, | ||
547 | .reset_gpio_port[0] = -EINVAL, | ||
548 | .reset_gpio_port[1] = IGEP3_GPIO_USBH_NRESET, | ||
549 | .reset_gpio_port[2] = -EINVAL, | ||
550 | }; | 552 | }; |
551 | 553 | ||
552 | #ifdef CONFIG_OMAP_MUX | 554 | #ifdef CONFIG_OMAP_MUX |
@@ -642,8 +644,10 @@ static void __init igep_init(void) | |||
642 | if (machine_is_igep0020()) { | 644 | if (machine_is_igep0020()) { |
643 | omap_display_init(&igep2_dss_data); | 645 | omap_display_init(&igep2_dss_data); |
644 | igep2_init_smsc911x(); | 646 | igep2_init_smsc911x(); |
647 | usbhs_init_phys(igep2_phy_data, ARRAY_SIZE(igep2_phy_data)); | ||
645 | usbhs_init(&igep2_usbhs_bdata); | 648 | usbhs_init(&igep2_usbhs_bdata); |
646 | } else { | 649 | } else { |
650 | usbhs_init_phys(igep3_phy_data, ARRAY_SIZE(igep3_phy_data)); | ||
647 | usbhs_init(&igep3_usbhs_bdata); | 651 | usbhs_init(&igep3_usbhs_bdata); |
648 | } | 652 | } |
649 | } | 653 | } |