ARM: OMAP3: cm-t3517: 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>

diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c
index a66da808cc4ab011d7d97f449bd33f6a51272b4c..6920f6cfc97c30e67ff45d75deb9bcebd59efe25 100644 (file)
--- a/arch/arm/mach-omap2/board-cm-t3517.c
+++ b/arch/arm/mach-omap2/board-cm-t3517.c
@@ -188,15 +188,22 @@ static inline void cm_t3517_init_rtc(void) {}
 #define HSUSB2_RESET_GPIO      (147)
 #define USB_HUB_RESET_GPIO     (152)
 
+static struct usbhs_phy_data phy_data[] __initdata = {
+       {
+               .port = 1,
+               .reset_gpio = HSUSB1_RESET_GPIO,
+               .vcc_gpio = -EINVAL,
+       },
+       {
+               .port = 2,
+               .reset_gpio = HSUSB2_RESET_GPIO,
+               .vcc_gpio = -EINVAL,
+       },
+};
+
 static struct usbhs_omap_platform_data cm_t3517_ehci_pdata __initdata = {
        .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
        .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
-       .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
-
-       .phy_reset  = true,
-       .reset_gpio_port[0]  = HSUSB1_RESET_GPIO,
-       .reset_gpio_port[1]  = HSUSB2_RESET_GPIO,
-       .reset_gpio_port[2]  = -EINVAL,
 };
 
 static int __init cm_t3517_init_usbh(void)
@@ -213,6 +220,7 @@ static int __init cm_t3517_init_usbh(void)
                msleep(1);
        }
 
+       usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));
        usbhs_init(&cm_t3517_ehci_pdata);
 
        return 0;