Commit 33d7be35 authored by Roger Quadros's avatar Roger Quadros Committed by Felipe Balbi

ARM: OMAP2+: usb-host: Adapt to USB phy-nop RESET line changes

The USB phy-nop nop driver expects the RESET line information
to be sent as a GPIO number via platform data. Adapt to that.
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 67c8d063
...@@ -460,8 +460,7 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys) ...@@ -460,8 +460,7 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys)
memset(&nop_pdata, 0, sizeof(nop_pdata)); memset(&nop_pdata, 0, sizeof(nop_pdata));
if (gpio_is_valid(phy->vcc_gpio)) if (gpio_is_valid(phy->vcc_gpio))
nop_pdata.needs_vcc = true; nop_pdata.needs_vcc = true;
if (gpio_is_valid(phy->reset_gpio)) nop_pdata.gpio_reset = phy->reset_gpio;
nop_pdata.needs_reset = true;
nop_pdata.type = USB_PHY_TYPE_USB2; nop_pdata.type = USB_PHY_TYPE_USB2;
/* create a NOP PHY device */ /* create a NOP PHY device */
...@@ -483,14 +482,6 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys) ...@@ -483,14 +482,6 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys)
usb_bind_phy("ehci-omap.0", phy->port - 1, phy_id); usb_bind_phy("ehci-omap.0", phy->port - 1, phy_id);
/* Do we need RESET regulator ? */
if (gpio_is_valid(phy->reset_gpio)) {
scnprintf(rail_name, MAX_STR,
"hsusb%d_reset", phy->port);
usbhs_add_regulator(rail_name, phy_id, "reset",
phy->reset_gpio, 1);
}
/* Do we need VCC regulator ? */ /* Do we need VCC regulator ? */
if (gpio_is_valid(phy->vcc_gpio)) { if (gpio_is_valid(phy->vcc_gpio)) {
scnprintf(rail_name, MAX_STR, "hsusb%d_vcc", phy->port); scnprintf(rail_name, MAX_STR, "hsusb%d_vcc", phy->port);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment